diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/packages/text/src/TextMetrics.js b/packages/text/src/TextMetrics.js index e61e3c1..ce3e85b 100644 --- a/packages/text/src/TextMetrics.js +++ b/packages/text/src/TextMetrics.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class TextMetrics +export class TextMetrics { /** * @param {string} text - the text that was measured diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/packages/text/src/TextMetrics.js b/packages/text/src/TextMetrics.js index e61e3c1..ce3e85b 100644 --- a/packages/text/src/TextMetrics.js +++ b/packages/text/src/TextMetrics.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class TextMetrics +export class TextMetrics { /** * @param {string} text - the text that was measured diff --git a/packages/text/src/TextStyle.js b/packages/text/src/TextStyle.js index ecdb691..e11a3cc 100644 --- a/packages/text/src/TextStyle.js +++ b/packages/text/src/TextStyle.js @@ -55,7 +55,7 @@ * @class * @memberof PIXI */ -export default class TextStyle +export class TextStyle { /** * @param {object} [style] - The style parameters diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/packages/text/src/TextMetrics.js b/packages/text/src/TextMetrics.js index e61e3c1..ce3e85b 100644 --- a/packages/text/src/TextMetrics.js +++ b/packages/text/src/TextMetrics.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class TextMetrics +export class TextMetrics { /** * @param {string} text - the text that was measured diff --git a/packages/text/src/TextStyle.js b/packages/text/src/TextStyle.js index ecdb691..e11a3cc 100644 --- a/packages/text/src/TextStyle.js +++ b/packages/text/src/TextStyle.js @@ -55,7 +55,7 @@ * @class * @memberof PIXI */ -export default class TextStyle +export class TextStyle { /** * @param {object} [style] - The style parameters diff --git a/packages/text/src/index.js b/packages/text/src/index.js index 5cb4c65..46114dc 100644 --- a/packages/text/src/index.js +++ b/packages/text/src/index.js @@ -1,5 +1,5 @@ -export { default as Text } from './Text'; -export { default as TextStyle } from './TextStyle'; -export { default as TextMetrics } from './TextMetrics'; +export * from './Text'; +export * from './TextStyle'; +export * from './TextMetrics'; export * from './const'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/packages/text/src/TextMetrics.js b/packages/text/src/TextMetrics.js index e61e3c1..ce3e85b 100644 --- a/packages/text/src/TextMetrics.js +++ b/packages/text/src/TextMetrics.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class TextMetrics +export class TextMetrics { /** * @param {string} text - the text that was measured diff --git a/packages/text/src/TextStyle.js b/packages/text/src/TextStyle.js index ecdb691..e11a3cc 100644 --- a/packages/text/src/TextStyle.js +++ b/packages/text/src/TextStyle.js @@ -55,7 +55,7 @@ * @class * @memberof PIXI */ -export default class TextStyle +export class TextStyle { /** * @param {object} [style] - The style parameters diff --git a/packages/text/src/index.js b/packages/text/src/index.js index 5cb4c65..46114dc 100644 --- a/packages/text/src/index.js +++ b/packages/text/src/index.js @@ -1,5 +1,5 @@ -export { default as Text } from './Text'; -export { default as TextStyle } from './TextStyle'; -export { default as TextMetrics } from './TextMetrics'; +export * from './Text'; +export * from './TextStyle'; +export * from './TextMetrics'; export * from './const'; diff --git a/packages/ticker/src/Ticker.js b/packages/ticker/src/Ticker.js index 0047103..0c3854f 100644 --- a/packages/ticker/src/Ticker.js +++ b/packages/ticker/src/Ticker.js @@ -1,6 +1,6 @@ import { settings } from './settings'; import { UPDATE_PRIORITY } from './const'; -import TickerListener from './TickerListener'; +import { TickerListener } from './TickerListener'; /** * A Ticker class that runs an update loop that other objects listen to. @@ -11,7 +11,7 @@ * @class * @memberof PIXI */ -export default class Ticker +export class Ticker { constructor() { diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/packages/text/src/TextMetrics.js b/packages/text/src/TextMetrics.js index e61e3c1..ce3e85b 100644 --- a/packages/text/src/TextMetrics.js +++ b/packages/text/src/TextMetrics.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class TextMetrics +export class TextMetrics { /** * @param {string} text - the text that was measured diff --git a/packages/text/src/TextStyle.js b/packages/text/src/TextStyle.js index ecdb691..e11a3cc 100644 --- a/packages/text/src/TextStyle.js +++ b/packages/text/src/TextStyle.js @@ -55,7 +55,7 @@ * @class * @memberof PIXI */ -export default class TextStyle +export class TextStyle { /** * @param {object} [style] - The style parameters diff --git a/packages/text/src/index.js b/packages/text/src/index.js index 5cb4c65..46114dc 100644 --- a/packages/text/src/index.js +++ b/packages/text/src/index.js @@ -1,5 +1,5 @@ -export { default as Text } from './Text'; -export { default as TextStyle } from './TextStyle'; -export { default as TextMetrics } from './TextMetrics'; +export * from './Text'; +export * from './TextStyle'; +export * from './TextMetrics'; export * from './const'; diff --git a/packages/ticker/src/Ticker.js b/packages/ticker/src/Ticker.js index 0047103..0c3854f 100644 --- a/packages/ticker/src/Ticker.js +++ b/packages/ticker/src/Ticker.js @@ -1,6 +1,6 @@ import { settings } from './settings'; import { UPDATE_PRIORITY } from './const'; -import TickerListener from './TickerListener'; +import { TickerListener } from './TickerListener'; /** * A Ticker class that runs an update loop that other objects listen to. @@ -11,7 +11,7 @@ * @class * @memberof PIXI */ -export default class Ticker +export class Ticker { constructor() { diff --git a/packages/ticker/src/TickerListener.js b/packages/ticker/src/TickerListener.js index b6174f3..af7800c 100644 --- a/packages/ticker/src/TickerListener.js +++ b/packages/ticker/src/TickerListener.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class TickerListener +export class TickerListener { /** * Constructor diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/packages/text/src/TextMetrics.js b/packages/text/src/TextMetrics.js index e61e3c1..ce3e85b 100644 --- a/packages/text/src/TextMetrics.js +++ b/packages/text/src/TextMetrics.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class TextMetrics +export class TextMetrics { /** * @param {string} text - the text that was measured diff --git a/packages/text/src/TextStyle.js b/packages/text/src/TextStyle.js index ecdb691..e11a3cc 100644 --- a/packages/text/src/TextStyle.js +++ b/packages/text/src/TextStyle.js @@ -55,7 +55,7 @@ * @class * @memberof PIXI */ -export default class TextStyle +export class TextStyle { /** * @param {object} [style] - The style parameters diff --git a/packages/text/src/index.js b/packages/text/src/index.js index 5cb4c65..46114dc 100644 --- a/packages/text/src/index.js +++ b/packages/text/src/index.js @@ -1,5 +1,5 @@ -export { default as Text } from './Text'; -export { default as TextStyle } from './TextStyle'; -export { default as TextMetrics } from './TextMetrics'; +export * from './Text'; +export * from './TextStyle'; +export * from './TextMetrics'; export * from './const'; diff --git a/packages/ticker/src/Ticker.js b/packages/ticker/src/Ticker.js index 0047103..0c3854f 100644 --- a/packages/ticker/src/Ticker.js +++ b/packages/ticker/src/Ticker.js @@ -1,6 +1,6 @@ import { settings } from './settings'; import { UPDATE_PRIORITY } from './const'; -import TickerListener from './TickerListener'; +import { TickerListener } from './TickerListener'; /** * A Ticker class that runs an update loop that other objects listen to. @@ -11,7 +11,7 @@ * @class * @memberof PIXI */ -export default class Ticker +export class Ticker { constructor() { diff --git a/packages/ticker/src/TickerListener.js b/packages/ticker/src/TickerListener.js index b6174f3..af7800c 100644 --- a/packages/ticker/src/TickerListener.js +++ b/packages/ticker/src/TickerListener.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class TickerListener +export class TickerListener { /** * Constructor diff --git a/packages/ticker/src/TickerPlugin.js b/packages/ticker/src/TickerPlugin.js index 360581f..833c6cb 100644 --- a/packages/ticker/src/TickerPlugin.js +++ b/packages/ticker/src/TickerPlugin.js @@ -1,4 +1,4 @@ -import Ticker from './Ticker'; +import { Ticker } from './Ticker'; import { UPDATE_PRIORITY } from './const'; /** @@ -12,7 +12,7 @@ * @class * @memberof PIXI */ -export default class TickerPlugin +export class TickerPlugin { /** * Initialize the plugin with scope of application instance diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/packages/text/src/TextMetrics.js b/packages/text/src/TextMetrics.js index e61e3c1..ce3e85b 100644 --- a/packages/text/src/TextMetrics.js +++ b/packages/text/src/TextMetrics.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class TextMetrics +export class TextMetrics { /** * @param {string} text - the text that was measured diff --git a/packages/text/src/TextStyle.js b/packages/text/src/TextStyle.js index ecdb691..e11a3cc 100644 --- a/packages/text/src/TextStyle.js +++ b/packages/text/src/TextStyle.js @@ -55,7 +55,7 @@ * @class * @memberof PIXI */ -export default class TextStyle +export class TextStyle { /** * @param {object} [style] - The style parameters diff --git a/packages/text/src/index.js b/packages/text/src/index.js index 5cb4c65..46114dc 100644 --- a/packages/text/src/index.js +++ b/packages/text/src/index.js @@ -1,5 +1,5 @@ -export { default as Text } from './Text'; -export { default as TextStyle } from './TextStyle'; -export { default as TextMetrics } from './TextMetrics'; +export * from './Text'; +export * from './TextStyle'; +export * from './TextMetrics'; export * from './const'; diff --git a/packages/ticker/src/Ticker.js b/packages/ticker/src/Ticker.js index 0047103..0c3854f 100644 --- a/packages/ticker/src/Ticker.js +++ b/packages/ticker/src/Ticker.js @@ -1,6 +1,6 @@ import { settings } from './settings'; import { UPDATE_PRIORITY } from './const'; -import TickerListener from './TickerListener'; +import { TickerListener } from './TickerListener'; /** * A Ticker class that runs an update loop that other objects listen to. @@ -11,7 +11,7 @@ * @class * @memberof PIXI */ -export default class Ticker +export class Ticker { constructor() { diff --git a/packages/ticker/src/TickerListener.js b/packages/ticker/src/TickerListener.js index b6174f3..af7800c 100644 --- a/packages/ticker/src/TickerListener.js +++ b/packages/ticker/src/TickerListener.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class TickerListener +export class TickerListener { /** * Constructor diff --git a/packages/ticker/src/TickerPlugin.js b/packages/ticker/src/TickerPlugin.js index 360581f..833c6cb 100644 --- a/packages/ticker/src/TickerPlugin.js +++ b/packages/ticker/src/TickerPlugin.js @@ -1,4 +1,4 @@ -import Ticker from './Ticker'; +import { Ticker } from './Ticker'; import { UPDATE_PRIORITY } from './const'; /** @@ -12,7 +12,7 @@ * @class * @memberof PIXI */ -export default class TickerPlugin +export class TickerPlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/ticker/src/index.js b/packages/ticker/src/index.js index 96a94fe..06e42e5 100644 --- a/packages/ticker/src/index.js +++ b/packages/ticker/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Ticker } from './Ticker'; -export { default as TickerPlugin } from './TickerPlugin'; +export * from './Ticker'; +export * from './TickerPlugin'; export * from './const'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/packages/text/src/TextMetrics.js b/packages/text/src/TextMetrics.js index e61e3c1..ce3e85b 100644 --- a/packages/text/src/TextMetrics.js +++ b/packages/text/src/TextMetrics.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class TextMetrics +export class TextMetrics { /** * @param {string} text - the text that was measured diff --git a/packages/text/src/TextStyle.js b/packages/text/src/TextStyle.js index ecdb691..e11a3cc 100644 --- a/packages/text/src/TextStyle.js +++ b/packages/text/src/TextStyle.js @@ -55,7 +55,7 @@ * @class * @memberof PIXI */ -export default class TextStyle +export class TextStyle { /** * @param {object} [style] - The style parameters diff --git a/packages/text/src/index.js b/packages/text/src/index.js index 5cb4c65..46114dc 100644 --- a/packages/text/src/index.js +++ b/packages/text/src/index.js @@ -1,5 +1,5 @@ -export { default as Text } from './Text'; -export { default as TextStyle } from './TextStyle'; -export { default as TextMetrics } from './TextMetrics'; +export * from './Text'; +export * from './TextStyle'; +export * from './TextMetrics'; export * from './const'; diff --git a/packages/ticker/src/Ticker.js b/packages/ticker/src/Ticker.js index 0047103..0c3854f 100644 --- a/packages/ticker/src/Ticker.js +++ b/packages/ticker/src/Ticker.js @@ -1,6 +1,6 @@ import { settings } from './settings'; import { UPDATE_PRIORITY } from './const'; -import TickerListener from './TickerListener'; +import { TickerListener } from './TickerListener'; /** * A Ticker class that runs an update loop that other objects listen to. @@ -11,7 +11,7 @@ * @class * @memberof PIXI */ -export default class Ticker +export class Ticker { constructor() { diff --git a/packages/ticker/src/TickerListener.js b/packages/ticker/src/TickerListener.js index b6174f3..af7800c 100644 --- a/packages/ticker/src/TickerListener.js +++ b/packages/ticker/src/TickerListener.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class TickerListener +export class TickerListener { /** * Constructor diff --git a/packages/ticker/src/TickerPlugin.js b/packages/ticker/src/TickerPlugin.js index 360581f..833c6cb 100644 --- a/packages/ticker/src/TickerPlugin.js +++ b/packages/ticker/src/TickerPlugin.js @@ -1,4 +1,4 @@ -import Ticker from './Ticker'; +import { Ticker } from './Ticker'; import { UPDATE_PRIORITY } from './const'; /** @@ -12,7 +12,7 @@ * @class * @memberof PIXI */ -export default class TickerPlugin +export class TickerPlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/ticker/src/index.js b/packages/ticker/src/index.js index 96a94fe..06e42e5 100644 --- a/packages/ticker/src/index.js +++ b/packages/ticker/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Ticker } from './Ticker'; -export { default as TickerPlugin } from './TickerPlugin'; +export * from './Ticker'; +export * from './TickerPlugin'; export * from './const'; diff --git a/packages/utils/src/media/CanvasRenderTarget.js b/packages/utils/src/media/CanvasRenderTarget.js index 8fe320f..ebb6114 100644 --- a/packages/utils/src/media/CanvasRenderTarget.js +++ b/packages/utils/src/media/CanvasRenderTarget.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.utils */ -export default class CanvasRenderTarget +export class CanvasRenderTarget { /** * @param {number} width - the width for the newly created canvas diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index aa2db53..b00e10d 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -26,7 +26,7 @@ // Export deprecations so Rollup can call it // in the footer after global is defined // other module must call this manually -import useDeprecated from './useDeprecated'; +import { useDeprecated } from './useDeprecated'; // Install renderer plugins Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 8ac4f5c..12f00d4 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -12,7 +12,7 @@ * @memberof PIXI * @function useDeprecated */ -export default function useDeprecated() +export function useDeprecated() { const PIXI = this; diff --git a/package-lock.json b/package-lock.json index 36968e9..73ffef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1317,9 +1317,9 @@ } }, "@pixi/jsdoc-template": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.2.tgz", - "integrity": "sha512-lHxnMk34RXW2BYctx2MBwc5F6rr1MYDCeuM464WGBfaUiJMBFOXRDJtbcHXS2GX2HMcK9ooOb612Hijk1d53LA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@pixi/jsdoc-template/-/jsdoc-template-2.4.3.tgz", + "integrity": "sha512-fnrQdFfA1sQHC8Grbx20cQIXeQIJ4VskBpbHaCdROiRi3nVQhRJjG4Vs0GxzmYiS4xMLGRVrZgNltXHs1nusvA==", "dev": true, "requires": { "taffydb": "^2.7.2", diff --git a/package.json b/package.json index f1adef2..7419191 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@lerna/batch-packages": "^3.13.0", "@lerna/filter-packages": "^3.13.0", "@lerna/project": "^3.13.1", - "@pixi/jsdoc-template": "^2.4.2", + "@pixi/jsdoc-template": "^2.4.3", "copyfiles": "^2.1.0", "cross-env": "^5.2.0", "electron": "^4.1.4", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 89916a0..5ef958d 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,4 +1,4 @@ -import accessibleTarget from './accessibleTarget'; +import { accessibleTarget } from './accessibleTarget'; import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; @@ -29,7 +29,7 @@ * @class * @memberof PIXI.accessibility */ -export default class AccessibilityManager +export class AccessibilityManager { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/accessibility/src/accessibleTarget.js b/packages/accessibility/src/accessibleTarget.js index 37ec047..150376b 100644 --- a/packages/accessibility/src/accessibleTarget.js +++ b/packages/accessibility/src/accessibleTarget.js @@ -14,7 +14,7 @@ * PIXI.accessibility.accessibleTarget * ); */ -export default { +export const accessibleTarget = { /** * Flag for if the object is accessible. If true AccessibilityManager will overlay a * shadow div with attributes set diff --git a/packages/accessibility/src/index.js b/packages/accessibility/src/index.js index 706ef66..e487e08 100644 --- a/packages/accessibility/src/index.js +++ b/packages/accessibility/src/index.js @@ -5,5 +5,5 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.accessibility */ -export { default as accessibleTarget } from './accessibleTarget'; -export { default as AccessibilityManager } from './AccessibilityManager'; +export * from './accessibleTarget'; +export * from './AccessibilityManager'; diff --git a/packages/app/src/Application.js b/packages/app/src/Application.js index 892e179..4a9e2b3 100644 --- a/packages/app/src/Application.js +++ b/packages/app/src/Application.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class Application +export class Application { /** * @param {object} [options] - The optional renderer parameters. diff --git a/packages/app/src/ResizePlugin.js b/packages/app/src/ResizePlugin.js index 80ac5d4..ac815a2 100644 --- a/packages/app/src/ResizePlugin.js +++ b/packages/app/src/ResizePlugin.js @@ -3,7 +3,7 @@ * @private * @class */ -export default class ResizePlugin +export class ResizePlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/app/src/index.js b/packages/app/src/index.js index e6ea3b0..65dd1a5 100644 --- a/packages/app/src/index.js +++ b/packages/app/src/index.js @@ -1,5 +1,5 @@ -import Application from './Application'; -import ResizePlugin from './ResizePlugin'; +import { Application } from './Application'; +import { ResizePlugin } from './ResizePlugin'; Application.registerPlugin(ResizePlugin); diff --git a/packages/canvas/canvas-extract/src/CanvasExtract.js b/packages/canvas/canvas-extract/src/CanvasExtract.js index 5b791cb..4dec821 100644 --- a/packages/canvas/canvas-extract/src/CanvasExtract.js +++ b/packages/canvas/canvas-extract/src/CanvasExtract.js @@ -12,7 +12,7 @@ * @class * @memberof PIXI.extract */ -export default class CanvasExtract +export class CanvasExtract { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-extract/src/index.js b/packages/canvas/canvas-extract/src/index.js index 75cb6d4..d6cf431 100644 --- a/packages/canvas/canvas-extract/src/index.js +++ b/packages/canvas/canvas-extract/src/index.js @@ -1 +1 @@ -export { default as CanvasExtract } from './CanvasExtract'; +export * from './CanvasExtract'; diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js index b7df597..462e52c 100644 --- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js +++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js @@ -19,7 +19,7 @@ * @protected * @memberof PIXI */ -export default class CanvasGraphicsRenderer +export class CanvasGraphicsRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The current PIXI renderer. diff --git a/packages/canvas/canvas-graphics/src/index.js b/packages/canvas/canvas-graphics/src/index.js index d921393..ecf2f9d 100644 --- a/packages/canvas/canvas-graphics/src/index.js +++ b/packages/canvas/canvas-graphics/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasGraphicsRenderer } from './CanvasGraphicsRenderer'; +export * from './CanvasGraphicsRenderer'; import './Graphics'; diff --git a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js index 00fbe0f..5fadd14 100644 --- a/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js +++ b/packages/canvas/canvas-mesh/src/CanvasMeshRenderer.js @@ -7,7 +7,7 @@ * @protected * @memberof PIXI */ -export default class CanvasMeshRenderer +export class CanvasMeshRenderer { /** * @param {PIXI.CanvasRenderer} renderer - The renderer this downport works for diff --git a/packages/canvas/canvas-mesh/src/index.js b/packages/canvas/canvas-mesh/src/index.js index 27f3c2f..ecbfcc4 100644 --- a/packages/canvas/canvas-mesh/src/index.js +++ b/packages/canvas/canvas-mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as CanvasMeshRenderer } from './CanvasMeshRenderer'; +export * from './CanvasMeshRenderer'; import './settings'; diff --git a/packages/canvas/canvas-prepare/src/CanvasPrepare.js b/packages/canvas/canvas-prepare/src/CanvasPrepare.js index 1ea6f48..f08ad8b 100644 --- a/packages/canvas/canvas-prepare/src/CanvasPrepare.js +++ b/packages/canvas/canvas-prepare/src/CanvasPrepare.js @@ -15,7 +15,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class CanvasPrepare extends BasePrepare +export class CanvasPrepare extends BasePrepare { /** * @param {PIXI.CanvasRenderer} renderer - A reference to the current renderer diff --git a/packages/canvas/canvas-prepare/src/index.js b/packages/canvas/canvas-prepare/src/index.js index 8cd378c..a25257b 100644 --- a/packages/canvas/canvas-prepare/src/index.js +++ b/packages/canvas/canvas-prepare/src/index.js @@ -1 +1 @@ -export { default as CanvasPrepare } from './CanvasPrepare'; +export * from './CanvasPrepare'; diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index b02ca59..1747202 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -1,7 +1,7 @@ import { AbstractRenderer, resources } from '@pixi/core'; import { CanvasRenderTarget, sayHello } from '@pixi/utils'; -import CanvasMaskManager from './utils/CanvasMaskManager'; -import mapCanvasBlendModesToPixi from './utils/mapCanvasBlendModesToPixi'; +import { CanvasMaskManager } from './utils/CanvasMaskManager'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import { RENDERER_TYPE, SCALE_MODES, BLEND_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -15,7 +15,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class CanvasRenderer extends AbstractRenderer +export class CanvasRenderer extends AbstractRenderer { /** * @param {object} [options] - The optional renderer parameters diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js index 7abf0f3..bfec51a 100644 --- a/packages/canvas/canvas-renderer/src/CanvasTinter.js +++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js @@ -1,5 +1,5 @@ import { hex2rgb, rgb2hex } from '@pixi/utils'; -import canUseNewCanvasBlendModes from './utils/canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; /** * Utility methods for Sprite/Texture tinting. @@ -7,10 +7,10 @@ * Tinting with the CanvasRenderer involves creating a new canvas to use as a texture, * so be aware of the performance implications. * - * @class + * @namespace PIXI.CanvasTinter * @memberof PIXI */ -const CanvasTinter = { +export const CanvasTinter = { /** * Basically this method just needs a sprite and a color and tints the sprite with the given color. * @@ -286,5 +286,3 @@ }; CanvasTinter.tintMethod = CanvasTinter.canUseMultiply ? CanvasTinter.tintWithMultiply : CanvasTinter.tintWithPerPixel; - -export default CanvasTinter; diff --git a/packages/canvas/canvas-renderer/src/Renderer.js b/packages/canvas/canvas-renderer/src/Renderer.js index 2f7702b..4c41eee 100644 --- a/packages/canvas/canvas-renderer/src/Renderer.js +++ b/packages/canvas/canvas-renderer/src/Renderer.js @@ -1,5 +1,5 @@ import { Renderer } from '@pixi/core'; -import CanvasRenderer from './CanvasRenderer'; +import { CanvasRenderer } from './CanvasRenderer'; // Reference to Renderer.create static function const parentCreate = Renderer.create; diff --git a/packages/canvas/canvas-renderer/src/index.js b/packages/canvas/canvas-renderer/src/index.js index deadfdb..80987c3 100644 --- a/packages/canvas/canvas-renderer/src/index.js +++ b/packages/canvas/canvas-renderer/src/index.js @@ -1,6 +1,6 @@ -export { default as CanvasRenderer } from './CanvasRenderer'; -export { default as canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -export { default as CanvasTinter } from './CanvasTinter'; +export * from './CanvasRenderer'; +export * from './utils/canUseNewCanvasBlendModes'; +export * from './CanvasTinter'; import './Renderer'; import './BaseTexture'; diff --git a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js index b99f862..0a1d14d 100644 --- a/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js +++ b/packages/canvas/canvas-renderer/src/utils/CanvasMaskManager.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class CanvasMaskManager +export class CanvasMaskManager { /** * @param {PIXI.CanvasRenderer} renderer - The canvas renderer. diff --git a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js index b940a91..f244cb1 100644 --- a/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js +++ b/packages/canvas/canvas-renderer/src/utils/canUseNewCanvasBlendModes.js @@ -26,7 +26,7 @@ * @private * @return {boolean} whether they are supported */ -export default function canUseNewCanvasBlendModes() +export function canUseNewCanvasBlendModes() { if (typeof document === 'undefined') { diff --git a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js index 66bd2eb..18fd3fc 100644 --- a/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js +++ b/packages/canvas/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.js @@ -1,5 +1,5 @@ import { BLEND_MODES } from '@pixi/constants'; -import canUseNewCanvasBlendModes from './canUseNewCanvasBlendModes'; +import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** * Maps blend combinations to Canvas. @@ -10,7 +10,7 @@ * @param {string[]} [array=[]] - The array to output into. * @return {string[]} Mapped modes. */ -export default function mapCanvasBlendModesToPixi(array = []) +export function mapCanvasBlendModesToPixi(array = []) { if (canUseNewCanvasBlendModes()) { diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index c61c338..507571c 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -29,7 +29,7 @@ * @protected * @memberof PIXI */ -export default class CanvasSpriteRenderer +export class CanvasSpriteRenderer { /** * @param {PIXI.Renderer} renderer -The renderer sprite this batch works for. diff --git a/packages/canvas/canvas-sprite/src/index.js b/packages/canvas/canvas-sprite/src/index.js index c99e2df..ce41400 100644 --- a/packages/canvas/canvas-sprite/src/index.js +++ b/packages/canvas/canvas-sprite/src/index.js @@ -1,3 +1,3 @@ -export { default as CanvasSpriteRenderer } from './CanvasSpriteRenderer'; +export * from './CanvasSpriteRenderer'; import './Sprite'; diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 2226a79..dd7bd86 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -3,7 +3,7 @@ import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; -import RenderTexture from './renderTexture/RenderTexture'; +import { RenderTexture } from './renderTexture/RenderTexture'; const tempMatrix = new Matrix(); @@ -16,7 +16,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class AbstractRenderer extends EventEmitter +export class AbstractRenderer extends EventEmitter { /** * @param {string} system - The name of the system this renderer is for. diff --git a/packages/core/src/Renderer.js b/packages/core/src/Renderer.js index d60bf55..e4587cc 100644 --- a/packages/core/src/Renderer.js +++ b/packages/core/src/Renderer.js @@ -1,20 +1,20 @@ -import AbstractRenderer from './AbstractRenderer'; +import { AbstractRenderer } from './AbstractRenderer'; import { sayHello, isWebGLSupported } from '@pixi/utils'; -import MaskSystem from './mask/MaskSystem'; -import StencilSystem from './mask/StencilSystem'; -import FilterSystem from './filters/FilterSystem'; -import FramebufferSystem from './framebuffer/FramebufferSystem'; -import RenderTextureSystem from './renderTexture/RenderTextureSystem'; -import TextureSystem from './textures/TextureSystem'; -import ProjectionSystem from './projection/ProjectionSystem'; -import StateSystem from './state/StateSystem'; -import GeometrySystem from './geometry/GeometrySystem'; -import ShaderSystem from './shader/ShaderSystem'; -import ContextSystem from './context/ContextSystem'; -import BatchSystem from './batch/BatchSystem'; -import TextureGCSystem from './textures/TextureGCSystem'; +import { MaskSystem } from './mask/MaskSystem'; +import { StencilSystem } from './mask/StencilSystem'; +import { FilterSystem } from './filters/FilterSystem'; +import { FramebufferSystem } from './framebuffer/FramebufferSystem'; +import { RenderTextureSystem } from './renderTexture/RenderTextureSystem'; +import { TextureSystem } from './textures/TextureSystem'; +import { ProjectionSystem } from './projection/ProjectionSystem'; +import { StateSystem } from './state/StateSystem'; +import { GeometrySystem } from './geometry/GeometrySystem'; +import { ShaderSystem } from './shader/ShaderSystem'; +import { ContextSystem } from './context/ContextSystem'; +import { BatchSystem } from './batch/BatchSystem'; +import { TextureGCSystem } from './textures/TextureGCSystem'; import { RENDERER_TYPE } from '@pixi/constants'; -import UniformGroup from './shader/UniformGroup'; +import { UniformGroup } from './shader/UniformGroup'; import { Matrix } from '@pixi/math'; import { Runner } from '@pixi/runner'; @@ -30,7 +30,7 @@ * @memberof PIXI * @extends PIXI.AbstractRenderer */ -export default class Renderer extends AbstractRenderer +export class Renderer extends AbstractRenderer { /** * Create renderer if WebGL is available. Overrideable diff --git a/packages/core/src/System.js b/packages/core/src/System.js index 0e794c5..c2b6320 100644 --- a/packages/core/src/System.js +++ b/packages/core/src/System.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class System +export class System { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/autoDetectRenderer.js b/packages/core/src/autoDetectRenderer.js index ec4c7d5..c29ea62 100644 --- a/packages/core/src/autoDetectRenderer.js +++ b/packages/core/src/autoDetectRenderer.js @@ -1,4 +1,4 @@ -import { default as Renderer } from './Renderer'; +import { Renderer } from './Renderer'; /** * This helper function will automatically detect which renderer you should be using. diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index bfee01c..be905ac 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -1,10 +1,10 @@ -import BatchDrawCall from './BatchDrawCall'; -import BaseTexture from '../textures/BaseTexture'; -import ObjectRenderer from './ObjectRenderer'; -import State from '../state/State'; -import ViewableBuffer from '../geometry/ViewableBuffer'; +import { BatchDrawCall } from './BatchDrawCall'; +import { BaseTexture } from '../textures/BaseTexture'; +import { ObjectRenderer } from './ObjectRenderer'; +import { State } from '../state/State'; +import { ViewableBuffer } from '../geometry/ViewableBuffer'; -import checkMaxIfStatementsInShader from '../shader/utils/checkMaxIfStatementsInShader'; +import { checkMaxIfStatementsInShader } from '../shader/utils/checkMaxIfStatementsInShader'; import { settings } from '@pixi/settings'; import { premultiplyBlendMode, premultiplyTint, nextPow2, log2 } from '@pixi/utils'; @@ -23,7 +23,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class AbstractBatchRenderer extends ObjectRenderer +export class AbstractBatchRenderer extends ObjectRenderer { /** * This will hook onto the renderer's `contextChange` diff --git a/packages/core/src/batch/BatchDrawCall.js b/packages/core/src/batch/BatchDrawCall.js index 9269188..229240f 100644 --- a/packages/core/src/batch/BatchDrawCall.js +++ b/packages/core/src/batch/BatchDrawCall.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class BatchDrawCall +export class BatchDrawCall { constructor() { diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 6275f8c..da3822b 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -1,6 +1,6 @@ import { TYPES } from '@pixi/constants'; -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Geometry used to batch standard PIXI content (e.g. Mesh, Sprite, Graphics objects). @@ -8,7 +8,7 @@ * @class * @memberof PIXI */ -export default class BatchGeometry extends Geometry +export class BatchGeometry extends Geometry { /** * @param {boolean} [_static=false] Optimization flag, where `false` diff --git a/packages/core/src/batch/BatchPluginFactory.js b/packages/core/src/batch/BatchPluginFactory.js index 63a9696..45157ba 100644 --- a/packages/core/src/batch/BatchPluginFactory.js +++ b/packages/core/src/batch/BatchPluginFactory.js @@ -1,6 +1,6 @@ -import BatchShaderGenerator from './BatchShaderGenerator'; -import BatchGeometry from './BatchGeometry'; -import AbstractBatchRenderer from './AbstractBatchRenderer'; +import { BatchShaderGenerator } from './BatchShaderGenerator'; +import { BatchGeometry } from './BatchGeometry'; +import { AbstractBatchRenderer } from './AbstractBatchRenderer'; import defaultVertex from './texture.vert'; import defaultFragment from './texture.frag'; @@ -10,7 +10,7 @@ * @memberof PIXI * @hideconstructor */ -export default class BatchPluginFactory +export class BatchPluginFactory { /** * Create a new BatchRenderer plugin for Renderer. this convenience can provide an easy way diff --git a/packages/core/src/batch/BatchShaderGenerator.js b/packages/core/src/batch/BatchShaderGenerator.js index 4abd176..924d55c 100644 --- a/packages/core/src/batch/BatchShaderGenerator.js +++ b/packages/core/src/batch/BatchShaderGenerator.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import UniformGroup from '../shader/UniformGroup'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { UniformGroup } from '../shader/UniformGroup'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class BatchShaderGenerator +export class BatchShaderGenerator { /** * @param {string} vertexSrc - Vertex shader diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..d9766f3 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import ObjectRenderer from './ObjectRenderer'; +import { System } from '../System'; +import { ObjectRenderer } from './ObjectRenderer'; /** * System plugin to the renderer to manage batching. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class BatchSystem extends System +export class BatchSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/batch/ObjectRenderer.js b/packages/core/src/batch/ObjectRenderer.js index 1776347..3b25961 100644 --- a/packages/core/src/batch/ObjectRenderer.js +++ b/packages/core/src/batch/ObjectRenderer.js @@ -6,7 +6,7 @@ * @extends PIXI.System * @memberof PIXI */ -export default class ObjectRenderer +export class ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this manager works for. diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js index 77a03ad..4e816f7 100644 --- a/packages/core/src/context/ContextSystem.js +++ b/packages/core/src/context/ContextSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { settings } from '../settings'; import { ENV } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class ContextSystem extends System +export class ContextSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/Filter.js b/packages/core/src/filters/Filter.js index 3cecb7f..6ea1117 100644 --- a/packages/core/src/filters/Filter.js +++ b/packages/core/src/filters/Filter.js @@ -1,6 +1,6 @@ -import Shader from '../shader/Shader'; -import Program from '../shader/Program'; -import State from '../state/State'; +import { Shader } from '../shader/Shader'; +import { Program } from '../shader/Program'; +import { State } from '../state/State'; import { settings } from '@pixi/settings'; import defaultVertex from './defaultFilter.vert'; import defaultFragment from './defaultFilter.frag'; @@ -141,7 +141,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class Filter extends Shader +export class Filter extends Shader { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/filters/FilterSystem.js b/packages/core/src/filters/FilterSystem.js index 6f01b1e..ba14ef2 100644 --- a/packages/core/src/filters/FilterSystem.js +++ b/packages/core/src/filters/FilterSystem.js @@ -1,10 +1,9 @@ -import System from '../System'; - -import RenderTexturePool from '../renderTexture/RenderTexturePool'; -import Quad from '../utils/Quad'; -import QuadUv from '../utils/QuadUv'; +import { System } from '../System'; +import { RenderTexturePool } from '../renderTexture/RenderTexturePool'; +import { Quad } from '../utils/Quad'; +import { QuadUv } from '../utils/QuadUv'; import { Rectangle, Matrix } from '@pixi/math'; -import UniformGroup from '../shader/UniformGroup'; +import { UniformGroup } from '../shader/UniformGroup'; import { DRAW_MODES } from '@pixi/constants'; /** @@ -87,7 +86,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class FilterSystem extends System +export class FilterSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js index 43fe2f4..3aabfd8 100644 --- a/packages/core/src/filters/spriteMask/SpriteMaskFilter.js +++ b/packages/core/src/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,8 @@ -import Filter from '../Filter'; +import { Filter } from '../Filter'; import { Matrix } from '@pixi/math'; import vertex from './spriteMaskFilter.vert'; import fragment from './spriteMaskFilter.frag'; -import { default as TextureMatrix } from '../../textures/TextureMatrix'; +import { TextureMatrix } from '../../textures/TextureMatrix'; /** * This handles a Sprite acting as a mask, as opposed to a Graphic. @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI */ -export default class SpriteMaskFilter extends Filter +export class SpriteMaskFilter extends Filter { /** * @param {PIXI.Sprite} sprite - the target sprite diff --git a/packages/core/src/framebuffer/Framebuffer.js b/packages/core/src/framebuffer/Framebuffer.js index c6aa68a..344e0af 100644 --- a/packages/core/src/framebuffer/Framebuffer.js +++ b/packages/core/src/framebuffer/Framebuffer.js @@ -1,6 +1,6 @@ import { Runner } from '@pixi/runner'; -import Texture from '../textures/BaseTexture'; -import DepthResource from '../textures/resources/DepthResource'; +import { BaseTexture } from '../textures/BaseTexture'; +import { DepthResource } from '../textures/resources/DepthResource'; import { FORMATS, TYPES } from '@pixi/constants'; /** @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Framebuffer +export class Framebuffer { /** * @param {number} width - Width of the frame buffer @@ -55,11 +55,11 @@ addColorTexture(index = 0, texture) { // TODO add some validation to the texture - same width / height etc? - this.colorTextures[index] = texture || new Texture(null, { scaleMode: 0, + this.colorTextures[index] = texture || new BaseTexture(null, { scaleMode: 0, resolution: 1, mipmap: false, width: this.width, - height: this.height });// || new Texture(); + height: this.height }); this.dirtyId++; this.dirtyFormat++; @@ -75,13 +75,13 @@ addDepthTexture(texture) { /* eslint-disable max-len */ - this.depthTexture = texture || new Texture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, + this.depthTexture = texture || new BaseTexture(new DepthResource(null, { width: this.width, height: this.height }), { scaleMode: 0, resolution: 1, width: this.width, height: this.height, mipmap: false, format: FORMATS.DEPTH_COMPONENT, - type: TYPES.UNSIGNED_SHORT });// UNSIGNED_SHORT; + type: TYPES.UNSIGNED_SHORT }); /* eslint-disable max-len */ this.dirtyId++; this.dirtyFormat++; diff --git a/packages/core/src/framebuffer/FramebufferSystem.js b/packages/core/src/framebuffer/FramebufferSystem.js index f062025..08f23a2 100644 --- a/packages/core/src/framebuffer/FramebufferSystem.js +++ b/packages/core/src/framebuffer/FramebufferSystem.js @@ -1,8 +1,8 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; -import Framebuffer from './Framebuffer'; +import { Framebuffer } from './Framebuffer'; /** * System plugin to the renderer to manage framebuffers. @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class FramebufferSystem extends System +export class FramebufferSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/Attribute.js b/packages/core/src/geometry/Attribute.js index 6158a23..0bcfc6b 100644 --- a/packages/core/src/geometry/Attribute.js +++ b/packages/core/src/geometry/Attribute.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Attribute +export class Attribute { /** * @param {string} buffer the id of the buffer that this attribute will look for diff --git a/packages/core/src/geometry/Buffer.js b/packages/core/src/geometry/Buffer.js index a1da80f..cb70b18 100644 --- a/packages/core/src/geometry/Buffer.js +++ b/packages/core/src/geometry/Buffer.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Buffer +export class Buffer { /** * @param {ArrayBuffer| SharedArrayBuffer|ArrayBufferView} data the data to store in the buffer. diff --git a/packages/core/src/geometry/GLBuffer.js b/packages/core/src/geometry/GLBuffer.js index 2b6ea1f..a042786 100644 --- a/packages/core/src/geometry/GLBuffer.js +++ b/packages/core/src/geometry/GLBuffer.js @@ -1,4 +1,4 @@ -export default class GLBuffer +export class GLBuffer { constructor(buffer) { diff --git a/packages/core/src/geometry/Geometry.js b/packages/core/src/geometry/Geometry.js index a97078c..8d967e7 100644 --- a/packages/core/src/geometry/Geometry.js +++ b/packages/core/src/geometry/Geometry.js @@ -1,7 +1,7 @@ -import Attribute from './Attribute'; -import Buffer from './Buffer'; -import interleaveTypedArrays from './utils/interleaveTypedArrays'; -import getBufferType from './utils/getBufferType'; +import { Attribute } from './Attribute'; +import { Buffer } from './Buffer'; +import { interleaveTypedArrays } from './utils/interleaveTypedArrays'; +import { getBufferType } from './utils/getBufferType'; import { Runner } from '@pixi/runner'; const byteSizeMap = { 5126: 4, 5123: 2, 5121: 1 }; @@ -37,7 +37,7 @@ * @class * @memberof PIXI */ -export default class Geometry +export class Geometry { /** * @param {PIXI.Buffer[]} [buffers] an array of buffers. optional. diff --git a/packages/core/src/geometry/GeometrySystem.js b/packages/core/src/geometry/GeometrySystem.js index 58d5fe5..56f93ca 100644 --- a/packages/core/src/geometry/GeometrySystem.js +++ b/packages/core/src/geometry/GeometrySystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLBuffer from './GLBuffer'; +import { System } from '../System'; +import { GLBuffer } from './GLBuffer'; import { ENV } from '@pixi/constants'; import { settings } from '../settings'; @@ -12,7 +12,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class GeometrySystem extends System +export class GeometrySystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/geometry/ViewableBuffer.js b/packages/core/src/geometry/ViewableBuffer.js index 13004c9..1e373b1 100644 --- a/packages/core/src/geometry/ViewableBuffer.js +++ b/packages/core/src/geometry/ViewableBuffer.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class ViewableBuffer +export class ViewableBuffer { /** * @param {number} size - The size of the buffer in bytes. diff --git a/packages/core/src/geometry/utils/getBufferType.js b/packages/core/src/geometry/utils/getBufferType.js index cb988d7..00a8d77 100644 --- a/packages/core/src/geometry/utils/getBufferType.js +++ b/packages/core/src/geometry/utils/getBufferType.js @@ -1,4 +1,4 @@ -export default function getBufferType(array) +export function getBufferType(array) { if (array.BYTES_PER_ELEMENT === 4) { diff --git a/packages/core/src/geometry/utils/interleaveTypedArrays.js b/packages/core/src/geometry/utils/interleaveTypedArrays.js index cce349d..31db1ed 100644 --- a/packages/core/src/geometry/utils/interleaveTypedArrays.js +++ b/packages/core/src/geometry/utils/interleaveTypedArrays.js @@ -1,4 +1,4 @@ -import getBufferType from './getBufferType'; +import { getBufferType } from './getBufferType'; /* eslint-disable object-shorthand */ const map = { @@ -8,7 +8,7 @@ Uint8Array: Uint8Array, }; -export default function interleaveTypedArrays(arrays, sizes) +export function interleaveTypedArrays(arrays, sizes) { let outSize = 0; let stride = 0; diff --git a/packages/core/src/geometry/utils/setVertexAttribArrays.js b/packages/core/src/geometry/utils/setVertexAttribArrays.js index 3ab1393..dacb50a 100644 --- a/packages/core/src/geometry/utils/setVertexAttribArrays.js +++ b/packages/core/src/geometry/utils/setVertexAttribArrays.js @@ -6,7 +6,7 @@ * @param state {*} * @private */ -export default function setVertexAttribArrays(gl, attribs, state) +export function setVertexAttribArrays(gl, attribs, state) { let i; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 4c08fdc..6c22ee6 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,6 +1,5 @@ import * as resources from './textures/resources'; import * as systems from './systems'; - import './settings'; export { systems }; @@ -8,36 +7,36 @@ export * from './autoDetectRenderer'; export * from './fragments'; -export { default as System } from './System'; -export { default as Renderer } from './Renderer'; -export { default as AbstractRenderer } from './AbstractRenderer'; -export { default as Framebuffer } from './framebuffer/Framebuffer'; -export { default as CubeTexture } from './textures/CubeTexture'; -export { default as BaseTexture } from './textures/BaseTexture'; -export { default as GLTexture } from './textures/BaseTexture'; -export { default as Texture } from './textures/Texture'; -export { default as TextureMatrix } from './textures/TextureMatrix'; -export { default as RenderTexture } from './renderTexture/RenderTexture'; -export { default as RenderTexturePool } from './renderTexture/RenderTexturePool'; -export { default as BaseRenderTexture } from './renderTexture/BaseRenderTexture'; -export { default as TextureUvs } from './textures/TextureUvs'; -export { default as State } from './state/State'; -export { default as ObjectRenderer } from './batch/ObjectRenderer'; -export { default as AbstractBatchRenderer } from './batch/AbstractBatchRenderer'; -export { default as BatchPluginFactory, BatchRenderer } from './batch/BatchPluginFactory'; -export { default as BatchShaderGenerator } from './batch/BatchShaderGenerator'; -export { default as BatchGeometry } from './batch/BatchGeometry'; -export { default as BatchDrawCall } from './batch/BatchDrawCall'; -export { default as Quad } from './utils/Quad'; -export { default as QuadUv } from './utils/QuadUv'; -export { default as checkMaxIfStatementsInShader } from './shader/utils/checkMaxIfStatementsInShader'; -export { default as Shader } from './shader/Shader'; -export { default as Program } from './shader/Program'; -export { default as GLProgram } from './shader/GLProgram'; -export { default as UniformGroup } from './shader/UniformGroup'; -export { default as SpriteMaskFilter } from './filters/spriteMask/SpriteMaskFilter'; -export { default as Filter } from './filters/Filter'; -export { default as Attribute } from './geometry/Attribute'; -export { default as Buffer } from './geometry/Buffer'; -export { default as Geometry } from './geometry/Geometry'; -export { default as ViewableBuffer } from './geometry/ViewableBuffer'; +export * from './System'; +export * from './Renderer'; +export * from './AbstractRenderer'; +export * from './framebuffer/Framebuffer'; +export * from './textures/CubeTexture'; +export * from './textures/Texture'; +export * from './textures/BaseTexture'; +export * from './textures/GLTexture'; +export * from './textures/TextureMatrix'; +export * from './renderTexture/RenderTexture'; +export * from './renderTexture/RenderTexturePool'; +export * from './renderTexture/BaseRenderTexture'; +export * from './textures/TextureUvs'; +export * from './state/State'; +export * from './batch/ObjectRenderer'; +export * from './batch/AbstractBatchRenderer'; +export * from './batch/BatchPluginFactory'; +export * from './batch/BatchShaderGenerator'; +export * from './batch/BatchGeometry'; +export * from './batch/BatchDrawCall'; +export * from './utils/Quad'; +export * from './utils/QuadUv'; +export * from './shader/utils/checkMaxIfStatementsInShader'; +export * from './shader/Shader'; +export * from './shader/Program'; +export * from './shader/GLProgram'; +export * from './shader/UniformGroup'; +export * from './filters/spriteMask/SpriteMaskFilter'; +export * from './filters/Filter'; +export * from './geometry/Attribute'; +export * from './geometry/Buffer'; +export * from './geometry/Geometry'; +export * from './geometry/ViewableBuffer'; diff --git a/packages/core/src/mask/MaskSystem.js b/packages/core/src/mask/MaskSystem.js index 00a5692..9ed514e 100644 --- a/packages/core/src/mask/MaskSystem.js +++ b/packages/core/src/mask/MaskSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import SpriteMaskFilter from '../filters/spriteMask/SpriteMaskFilter'; +import { System } from '../System'; +import { SpriteMaskFilter } from '../filters/spriteMask/SpriteMaskFilter'; /** * System plugin to the renderer to manage masks. @@ -8,7 +8,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class MaskSystem extends System +export class MaskSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/mask/StencilSystem.js b/packages/core/src/mask/StencilSystem.js index 0452e31..c3c15a4 100644 --- a/packages/core/src/mask/StencilSystem.js +++ b/packages/core/src/mask/StencilSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; /** * System plugin to the renderer to manage stencils (used for masks). @@ -7,7 +7,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StencilSystem extends System +export class StencilSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/projection/ProjectionSystem.js b/packages/core/src/projection/ProjectionSystem.js index fcafa61..2a24ab4 100644 --- a/packages/core/src/projection/ProjectionSystem.js +++ b/packages/core/src/projection/ProjectionSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Matrix } from '@pixi/math'; /** @@ -9,7 +9,7 @@ * @memberof PIXI.systems */ -export default class ProjectionSystem extends System +export class ProjectionSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/renderTexture/BaseRenderTexture.js b/packages/core/src/renderTexture/BaseRenderTexture.js index 17666f9..bd14e06 100644 --- a/packages/core/src/renderTexture/BaseRenderTexture.js +++ b/packages/core/src/renderTexture/BaseRenderTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from '../textures/BaseTexture'; -import Framebuffer from '../framebuffer/Framebuffer'; +import { BaseTexture } from '../textures/BaseTexture'; +import { Framebuffer } from '../framebuffer/Framebuffer'; /** * A BaseRenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class BaseRenderTexture extends BaseTexture +export class BaseRenderTexture extends BaseTexture { /** * @param {object} [options] diff --git a/packages/core/src/renderTexture/RenderTexture.js b/packages/core/src/renderTexture/RenderTexture.js index 245f96a..fddc9cf 100644 --- a/packages/core/src/renderTexture/RenderTexture.js +++ b/packages/core/src/renderTexture/RenderTexture.js @@ -1,5 +1,5 @@ -import BaseRenderTexture from './BaseRenderTexture'; -import Texture from '../textures/Texture'; +import { BaseRenderTexture } from './BaseRenderTexture'; +import { Texture } from '../textures/Texture'; /** * A RenderTexture is a special texture that allows any PixiJS display object to be rendered to it. @@ -41,7 +41,7 @@ * @extends PIXI.Texture * @memberof PIXI */ -export default class RenderTexture extends Texture +export class RenderTexture extends Texture { /** * @param {PIXI.BaseRenderTexture} baseRenderTexture - The base texture object that this texture uses diff --git a/packages/core/src/renderTexture/RenderTexturePool.js b/packages/core/src/renderTexture/RenderTexturePool.js index 436f5db..6a03035 100644 --- a/packages/core/src/renderTexture/RenderTexturePool.js +++ b/packages/core/src/renderTexture/RenderTexturePool.js @@ -1,5 +1,5 @@ -import RenderTexture from './RenderTexture'; -import BaseRenderTexture from './BaseRenderTexture'; +import { RenderTexture } from './RenderTexture'; +import { BaseRenderTexture } from './BaseRenderTexture'; import { nextPow2 } from '@pixi/utils'; /** @@ -14,7 +14,7 @@ * @class * @memberof PIXI */ -export default class RenderTexturePool +export class RenderTexturePool { /** * @param {object} [textureOptions] - options that will be passed to BaseRenderTexture constructor diff --git a/packages/core/src/renderTexture/RenderTextureSystem.js b/packages/core/src/renderTexture/RenderTextureSystem.js index 57c2fcc..0bd97ee 100644 --- a/packages/core/src/renderTexture/RenderTextureSystem.js +++ b/packages/core/src/renderTexture/RenderTextureSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { Rectangle } from '@pixi/math'; const tempRect = new Rectangle(); @@ -13,7 +13,7 @@ * @memberof PIXI.systems */ -export default class RenderTextureSystem extends System +export class RenderTextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/GLProgram.js b/packages/core/src/shader/GLProgram.js index efa9ee1..bfd29ed 100644 --- a/packages/core/src/shader/GLProgram.js +++ b/packages/core/src/shader/GLProgram.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GLProgram +export class GLProgram { /** * Makes a new Pixi program diff --git a/packages/core/src/shader/Program.js b/packages/core/src/shader/Program.js index f318112..f02d4a4 100644 --- a/packages/core/src/shader/Program.js +++ b/packages/core/src/shader/Program.js @@ -22,7 +22,7 @@ * @class * @memberof PIXI */ -export default class Program +export class Program { /** * @param {string} [vertexSrc] - The source of the vertex shader. diff --git a/packages/core/src/shader/Shader.js b/packages/core/src/shader/Shader.js index db82872..0d968b1 100644 --- a/packages/core/src/shader/Shader.js +++ b/packages/core/src/shader/Shader.js @@ -1,5 +1,5 @@ -import Program from './Program'; -import UniformGroup from './UniformGroup'; +import { Program } from './Program'; +import { UniformGroup } from './UniformGroup'; /** * A helper class for shaders @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -class Shader +export class Shader { /** * @param {PIXI.Program} [program] - The program the shader will use. @@ -109,5 +109,3 @@ return new Shader(program, uniforms); } } - -export default Shader; diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js index f8324a4..49ddbe8 100644 --- a/packages/core/src/shader/ShaderSystem.js +++ b/packages/core/src/shader/ShaderSystem.js @@ -1,5 +1,5 @@ -import System from '../System'; -import GLProgram from './GLProgram'; +import { System } from '../System'; +import { GLProgram } from './GLProgram'; import { generateUniformsSync, unsafeEvalSupported, defaultValue, @@ -14,7 +14,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class ShaderSystem extends System +export class ShaderSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/shader/UniformGroup.js b/packages/core/src/shader/UniformGroup.js index 258e1c5..8a35ae7 100644 --- a/packages/core/src/shader/UniformGroup.js +++ b/packages/core/src/shader/UniformGroup.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -class UniformGroup +export class UniformGroup { /** * @param {object} [uniforms] - Custom uniforms to use to augment the built-in ones. @@ -68,5 +68,3 @@ return new UniformGroup(uniforms, _static); } } - -export default UniformGroup; diff --git a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js index de926fc..0375cdc 100644 --- a/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js +++ b/packages/core/src/shader/utils/checkMaxIfStatementsInShader.js @@ -7,7 +7,7 @@ '}', ].join('\n'); -export default function checkMaxIfStatementsInShader(maxIfs, gl) +export function checkMaxIfStatementsInShader(maxIfs, gl) { if (maxIfs === 0) { diff --git a/packages/core/src/shader/utils/compileProgram.js b/packages/core/src/shader/utils/compileProgram.js index 819f04c..16b1733 100644 --- a/packages/core/src/shader/utils/compileProgram.js +++ b/packages/core/src/shader/utils/compileProgram.js @@ -8,7 +8,7 @@ * @param attributeLocations {Object} An attribute location map that lets you manually set the attribute locations * @return {WebGLProgram} the shader program */ -export default function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) +export function compileProgram(gl, vertexSrc, fragmentSrc, attributeLocations) { const glVertShader = compileShader(gl, gl.VERTEX_SHADER, vertexSrc); const glFragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentSrc); diff --git a/packages/core/src/shader/utils/defaultValue.js b/packages/core/src/shader/utils/defaultValue.js index 09a5d9f..0e17804 100644 --- a/packages/core/src/shader/utils/defaultValue.js +++ b/packages/core/src/shader/utils/defaultValue.js @@ -5,7 +5,7 @@ * @param size {Number} * @private */ -export default function defaultValue(type, size) +export function defaultValue(type, size) { switch (type) { diff --git a/packages/core/src/shader/utils/extractUniformsFromSrc.js b/packages/core/src/shader/utils/extractUniformsFromSrc.js index 5c39dd0..d0f85c4 100644 --- a/packages/core/src/shader/utils/extractUniformsFromSrc.js +++ b/packages/core/src/shader/utils/extractUniformsFromSrc.js @@ -1,6 +1,6 @@ -import defaultValue from './defaultValue'; +import { defaultValue } from './defaultValue'; -export default function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) +export function extractUniformsFromSrc(vertexSrc, fragmentSrc, mask) { const vertUniforms = extractUniformsFromString(vertexSrc, mask); const fragUniforms = extractUniformsFromString(fragmentSrc, mask); diff --git a/packages/core/src/shader/utils/generateUniformsSync.js b/packages/core/src/shader/utils/generateUniformsSync.js index e4d7749..f11fbbb 100644 --- a/packages/core/src/shader/utils/generateUniformsSync.js +++ b/packages/core/src/shader/utils/generateUniformsSync.js @@ -78,7 +78,7 @@ sampler2DArray: 'gl.uniform1iv(location, v)', }; -export default function generateUniformsSync(group, uniformData) +export function generateUniformsSync(group, uniformData) { let textureCount = 0; let func = `var v = null; diff --git a/packages/core/src/shader/utils/getMaxFragmentPrecision.js b/packages/core/src/shader/utils/getMaxFragmentPrecision.js index df58c77..8f75550 100644 --- a/packages/core/src/shader/utils/getMaxFragmentPrecision.js +++ b/packages/core/src/shader/utils/getMaxFragmentPrecision.js @@ -1,9 +1,9 @@ -import getTestContext from './getTestContext'; +import { getTestContext } from './getTestContext'; import { PRECISION } from '@pixi/constants'; let maxFragmentPrecision; -export default function getMaxFragmentPrecision() +export function getMaxFragmentPrecision() { if (!maxFragmentPrecision) { diff --git a/packages/core/src/shader/utils/getTestContext.js b/packages/core/src/shader/utils/getTestContext.js index 573e98f..4f09429 100644 --- a/packages/core/src/shader/utils/getTestContext.js +++ b/packages/core/src/shader/utils/getTestContext.js @@ -11,7 +11,7 @@ * @private * @returns {webGL-context} a gl context to test with */ -export default function getTestContext() +export function getTestContext() { if (context === unknownContext) { diff --git a/packages/core/src/shader/utils/index.js b/packages/core/src/shader/utils/index.js index b5c4827..4e01faa 100644 --- a/packages/core/src/shader/utils/index.js +++ b/packages/core/src/shader/utils/index.js @@ -1,10 +1,10 @@ -export { default as compileProgram } from './compileProgram'; -export { default as defaultValue } from './defaultValue'; -export { default as getMaxFragmentPrecision } from './getMaxFragmentPrecision'; -export { default as setPrecision } from './setPrecision'; -export { default as mapSize } from './mapSize'; -export { default as mapType } from './mapType'; -export { default as generateUniformsSync } from './generateUniformsSync'; -export { default as getTestContext } from './getTestContext'; -export { default as checkMaxIfStatementsInShader } from './checkMaxIfStatementsInShader'; -export { default as unsafeEvalSupported } from './unsafeEvalSupported'; +export * from './compileProgram'; +export * from './defaultValue'; +export * from './getMaxFragmentPrecision'; +export * from './setPrecision'; +export * from './mapSize'; +export * from './mapType'; +export * from './generateUniformsSync'; +export * from './getTestContext'; +export * from './checkMaxIfStatementsInShader'; +export * from './unsafeEvalSupported'; diff --git a/packages/core/src/shader/utils/mapSize.js b/packages/core/src/shader/utils/mapSize.js index 22e80d1..a08bfcf 100644 --- a/packages/core/src/shader/utils/mapSize.js +++ b/packages/core/src/shader/utils/mapSize.js @@ -28,7 +28,7 @@ * @param type {String} * @return {Number} */ -export default function mapSize(type) +export function mapSize(type) { return GLSL_TO_SIZE[type]; } diff --git a/packages/core/src/shader/utils/mapType.js b/packages/core/src/shader/utils/mapType.js index d288b7c..f7d13c8 100644 --- a/packages/core/src/shader/utils/mapType.js +++ b/packages/core/src/shader/utils/mapType.js @@ -25,7 +25,7 @@ SAMPLER_2D_ARRAY: 'sampler2DArray', }; -export default function mapType(gl, type) +export function mapType(gl, type) { if (!GL_TABLE) { diff --git a/packages/core/src/shader/utils/setPrecision.js b/packages/core/src/shader/utils/setPrecision.js index bc13eca..daf32ce 100644 --- a/packages/core/src/shader/utils/setPrecision.js +++ b/packages/core/src/shader/utils/setPrecision.js @@ -11,7 +11,7 @@ * * @return {string} modified shader source */ -export default function setPrecision(src, requestedPrecision, maxSupportedPrecision) +export function setPrecision(src, requestedPrecision, maxSupportedPrecision) { if (src.substring(0, 9) !== 'precision') { diff --git a/packages/core/src/shader/utils/unsafeEvalSupported.js b/packages/core/src/shader/utils/unsafeEvalSupported.js index 24fc7ff..491184f 100644 --- a/packages/core/src/shader/utils/unsafeEvalSupported.js +++ b/packages/core/src/shader/utils/unsafeEvalSupported.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function unsafeEvalSupported() +export function unsafeEvalSupported() { if (typeof unsafeEval === 'boolean') { diff --git a/packages/core/src/state/State.js b/packages/core/src/state/State.js index 9ef36dc..a37d687 100644 --- a/packages/core/src/state/State.js +++ b/packages/core/src/state/State.js @@ -17,7 +17,7 @@ * @class * @memberof PIXI */ -export default class State +export class State { constructor() { diff --git a/packages/core/src/state/StateSystem.js b/packages/core/src/state/StateSystem.js index 695a3cb..f426f26 100755 --- a/packages/core/src/state/StateSystem.js +++ b/packages/core/src/state/StateSystem.js @@ -1,6 +1,6 @@ -import mapWebGLBlendModesToPixi from './utils/mapWebGLBlendModesToPixi'; -import System from '../System'; -import State from './State'; +import { mapWebGLBlendModesToPixi } from './utils/mapWebGLBlendModesToPixi'; +import { System } from '../System'; +import { State } from './State'; import { BLEND_MODES } from '@pixi/constants'; const BLEND = 0; @@ -16,7 +16,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class StateSystem extends System +export class StateSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js index e53a723..28f1f3e 100644 --- a/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js +++ b/packages/core/src/state/utils/mapWebGLBlendModesToPixi.js @@ -10,7 +10,7 @@ * @param {number[][]} [array=[]] - The array to output into. * @return {number[][]} Mapped modes. */ -export default function mapWebGLBlendModesToPixi(gl, array = []) +export function mapWebGLBlendModesToPixi(gl, array = []) { // TODO - premultiply alpha would be different. // add a boolean for that! diff --git a/packages/core/src/systems.js b/packages/core/src/systems.js index 8edd9d5..bdcc7be 100644 --- a/packages/core/src/systems.js +++ b/packages/core/src/systems.js @@ -2,16 +2,16 @@ * Systems are individual components to the Renderer pipeline. * @namespace PIXI.systems */ -export { default as FilterSystem } from './filters/FilterSystem'; -export { default as BatchSystem } from './batch/BatchSystem'; -export { default as ContextSystem } from './context/ContextSystem'; -export { default as FramebufferSystem } from './framebuffer/FramebufferSystem'; -export { default as GeometrySystem } from './geometry/GeometrySystem'; -export { default as MaskSystem } from './mask/MaskSystem'; -export { default as StencilSystem } from './mask/StencilSystem'; -export { default as ProjectionSystem } from './projection/ProjectionSystem'; -export { default as RenderTextureSystem } from './renderTexture/RenderTextureSystem'; -export { default as ShaderSystem } from './shader/ShaderSystem'; -export { default as StateSystem } from './state/StateSystem'; -export { default as TextureGCSystem } from './textures/TextureGCSystem'; -export { default as TextureSystem } from './textures/TextureSystem'; +export * from './filters/FilterSystem'; +export * from './batch/BatchSystem'; +export * from './context/ContextSystem'; +export * from './framebuffer/FramebufferSystem'; +export * from './geometry/GeometrySystem'; +export * from './mask/MaskSystem'; +export * from './mask/StencilSystem'; +export * from './projection/ProjectionSystem'; +export * from './renderTexture/RenderTextureSystem'; +export * from './shader/ShaderSystem'; +export * from './state/StateSystem'; +export * from './textures/TextureGCSystem'; +export * from './textures/TextureSystem'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8c75be5..fd15f7a 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,8 +1,8 @@ import { BaseTextureCache, EventEmitter, isPow2, TextureCache, uid } from '@pixi/utils'; import { FORMATS, SCALE_MODES, TARGETS, TYPES } from '@pixi/constants'; -import Resource from './resources/Resource'; -import BufferResource from './resources/BufferResource'; +import { Resource } from './resources/Resource'; +import { BufferResource } from './resources/BufferResource'; import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; @@ -39,7 +39,7 @@ * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ -export default class BaseTexture extends EventEmitter +export class BaseTexture extends EventEmitter { constructor(resource = null, options = null) { diff --git a/packages/core/src/textures/CubeTexture.js b/packages/core/src/textures/CubeTexture.js index bd5f223..2cc6b99 100644 --- a/packages/core/src/textures/CubeTexture.js +++ b/packages/core/src/textures/CubeTexture.js @@ -1,5 +1,5 @@ -import BaseTexture from './BaseTexture'; -import CubeResource from './resources/CubeResource'; +import { BaseTexture } from './BaseTexture'; +import { CubeResource } from './resources/CubeResource'; /** * A Texture that depends on six other resources. @@ -8,7 +8,7 @@ * @extends PIXI.BaseTexture * @memberof PIXI */ -export default class CubeTexture extends BaseTexture +export class CubeTexture extends BaseTexture { /** * Generate a new CubeTexture. diff --git a/packages/core/src/textures/GLTexture.js b/packages/core/src/textures/GLTexture.js index 827394d..bdd231a 100644 --- a/packages/core/src/textures/GLTexture.js +++ b/packages/core/src/textures/GLTexture.js @@ -3,7 +3,7 @@ * @class * @memberof PIXI */ -export default class GLTexture +export class GLTexture { constructor(texture) { diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index d9b4adf..ea5c843 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -1,7 +1,7 @@ -import BaseTexture from './BaseTexture'; -import ImageResource from './resources/ImageResource'; -import CanvasResource from './resources/CanvasResource'; -import TextureUvs from './TextureUvs'; +import { BaseTexture } from './BaseTexture'; +import { ImageResource } from './resources/ImageResource'; +import { CanvasResource } from './resources/CanvasResource'; +import { TextureUvs } from './TextureUvs'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; @@ -38,7 +38,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class Texture extends EventEmitter +export class Texture extends EventEmitter { /** * @param {PIXI.BaseTexture} baseTexture - The base texture source to create the texture from diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index 1e3b394..39c840c 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -1,4 +1,4 @@ -import System from '../System'; +import { System } from '../System'; import { GC_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; @@ -10,7 +10,7 @@ * @memberof PIXI.systems * @extends PIXI.System */ -export default class TextureGCSystem extends System +export class TextureGCSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureMatrix.js b/packages/core/src/textures/TextureMatrix.js index 37d1444..7c720b8 100644 --- a/packages/core/src/textures/TextureMatrix.js +++ b/packages/core/src/textures/TextureMatrix.js @@ -19,7 +19,7 @@ * @class * @memberof PIXI */ -export default class TextureMatrix +export class TextureMatrix { /** * diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index a04fe29..15d74c2 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -1,6 +1,6 @@ -import System from '../System'; -import BaseTexture from './BaseTexture'; -import GLTexture from './GLTexture'; +import { System } from '../System'; +import { BaseTexture } from './BaseTexture'; +import { GLTexture } from './GLTexture'; import { removeItems } from '@pixi/utils'; import { MIPMAP_MODES, WRAP_MODES, SCALE_MODES, TYPES } from '@pixi/constants'; @@ -11,7 +11,7 @@ * @extends PIXI.System * @memberof PIXI.systems */ -export default class TextureSystem extends System +export class TextureSystem extends System { /** * @param {PIXI.Renderer} renderer - The renderer this System works for. diff --git a/packages/core/src/textures/TextureUvs.js b/packages/core/src/textures/TextureUvs.js index 519842c..322e973 100644 --- a/packages/core/src/textures/TextureUvs.js +++ b/packages/core/src/textures/TextureUvs.js @@ -16,7 +16,7 @@ * @protected * @memberof PIXI */ -export default class TextureUvs +export class TextureUvs { constructor() { diff --git a/packages/core/src/textures/resources/ArrayResource.js b/packages/core/src/textures/resources/ArrayResource.js index f1c752e..c5fddbf 100644 --- a/packages/core/src/textures/resources/ArrayResource.js +++ b/packages/core/src/textures/resources/ArrayResource.js @@ -1,5 +1,5 @@ -import Resource from './Resource'; -import BaseTexture from '../BaseTexture'; +import { Resource } from './Resource'; +import { BaseTexture } from '../BaseTexture'; import { TARGETS } from '@pixi/constants'; import { autoDetectResource } from './autoDetectResource'; @@ -15,7 +15,7 @@ * @param {number} [options.width] - Width of the resource * @param {number} [options.height] - Height of the resource */ -export default class ArrayResource extends Resource +export class ArrayResource extends Resource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/BaseImageResource.js b/packages/core/src/textures/resources/BaseImageResource.js index d0982b2..e931400 100644 --- a/packages/core/src/textures/resources/BaseImageResource.js +++ b/packages/core/src/textures/resources/BaseImageResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; import { determineCrossOrigin } from '@pixi/utils'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BaseImageResource extends Resource +export class BaseImageResource extends Resource { /** * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement|SVGElement} source diff --git a/packages/core/src/textures/resources/BufferResource.js b/packages/core/src/textures/resources/BufferResource.js index 0695e97..3b99c93 100644 --- a/packages/core/src/textures/resources/BufferResource.js +++ b/packages/core/src/textures/resources/BufferResource.js @@ -1,4 +1,4 @@ -import Resource from './Resource'; +import { Resource } from './Resource'; /** * @interface SharedArrayBuffer @@ -10,7 +10,7 @@ * @extends PIXI.resources.Resource * @memberof PIXI.resources */ -export default class BufferResource extends Resource +export class BufferResource extends Resource { /** * @param {Float32Array|Uint8Array|Uint32Array} source - Source buffer diff --git a/packages/core/src/textures/resources/CanvasResource.js b/packages/core/src/textures/resources/CanvasResource.js index cc03236..90400a0 100644 --- a/packages/core/src/textures/resources/CanvasResource.js +++ b/packages/core/src/textures/resources/CanvasResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * @interface OffscreenCanvas @@ -11,7 +11,7 @@ * @memberof PIXI.resources * @param {HTMLCanvasElement} source - Canvas element to use */ -export default class CanvasResource extends BaseImageResource +export class CanvasResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/CubeResource.js b/packages/core/src/textures/resources/CubeResource.js index 5abd9a7..117fa34 100644 --- a/packages/core/src/textures/resources/CubeResource.js +++ b/packages/core/src/textures/resources/CubeResource.js @@ -1,4 +1,4 @@ -import ArrayResource from './ArrayResource'; +import { ArrayResource } from './ArrayResource'; import { TARGETS } from '@pixi/constants'; /** @@ -13,7 +13,7 @@ * @param {number} [options.width] - Width of resource * @param {number} [options.height] - Height of resource */ -export default class CubeResource extends ArrayResource +export class CubeResource extends ArrayResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/DepthResource.js b/packages/core/src/textures/resources/DepthResource.js index 79c5186..a7f7b9f 100644 --- a/packages/core/src/textures/resources/DepthResource.js +++ b/packages/core/src/textures/resources/DepthResource.js @@ -1,4 +1,4 @@ -import BufferResource from './BufferResource'; +import { BufferResource } from './BufferResource'; /** * Resource type for DepthTexture. @@ -6,7 +6,7 @@ * @extends PIXI.resources.BufferResource * @memberof PIXI.resources */ -export default class DepthResource extends BufferResource +export class DepthResource extends BufferResource { /** * Upload the texture to the GPU. diff --git a/packages/core/src/textures/resources/ImageBitmapResource.js b/packages/core/src/textures/resources/ImageBitmapResource.js index 6c91799..6811872 100644 --- a/packages/core/src/textures/resources/ImageBitmapResource.js +++ b/packages/core/src/textures/resources/ImageBitmapResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for ImageBitmap. @@ -7,7 +7,7 @@ * @memberof PIXI.resources * @param {ImageBitmap} source - Image element to use */ -export default class ImageBitmapResource extends BaseImageResource +export class ImageBitmapResource extends BaseImageResource { /** * Used to auto-detect the type of resource. diff --git a/packages/core/src/textures/resources/ImageResource.js b/packages/core/src/textures/resources/ImageResource.js index c490f41..227df37 100644 --- a/packages/core/src/textures/resources/ImageResource.js +++ b/packages/core/src/textures/resources/ImageResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { settings } from '@pixi/settings'; /** @@ -7,7 +7,7 @@ * @extends PIXI.resources.BaseImageResource * @memberof PIXI.resources */ -export default class ImageResource extends BaseImageResource +export class ImageResource extends BaseImageResource { /** * @param {HTMLImageElement|string} source - image source or URL diff --git a/packages/core/src/textures/resources/Resource.js b/packages/core/src/textures/resources/Resource.js index 36b30e5..be146eb 100644 --- a/packages/core/src/textures/resources/Resource.js +++ b/packages/core/src/textures/resources/Resource.js @@ -8,7 +8,7 @@ * @class * @memberof PIXI.resources */ -export default class Resource +export class Resource { /** * @param {number} [width=0] Width of the resource diff --git a/packages/core/src/textures/resources/SVGResource.js b/packages/core/src/textures/resources/SVGResource.js index 3cc2f38..fbeb76f 100644 --- a/packages/core/src/textures/resources/SVGResource.js +++ b/packages/core/src/textures/resources/SVGResource.js @@ -1,5 +1,5 @@ import { uid } from '@pixi/utils'; -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; /** * Resource type for SVG elements and graphics. @@ -13,7 +13,7 @@ * @param {number} [options.height] Rasterize SVG this high. Aspect ratio preserved if width not specified. * @param {boolean} [options.autoLoad=true] Start loading right away. */ -export default class SVGResource extends BaseImageResource +export class SVGResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/VideoResource.js b/packages/core/src/textures/resources/VideoResource.js index e04f69f..cdee617 100644 --- a/packages/core/src/textures/resources/VideoResource.js +++ b/packages/core/src/textures/resources/VideoResource.js @@ -1,4 +1,4 @@ -import BaseImageResource from './BaseImageResource'; +import { BaseImageResource } from './BaseImageResource'; import { Ticker } from '@pixi/ticker'; /** @@ -14,7 +14,7 @@ * Leave at 0 to update at every render. * @param {boolean} [options.crossorigin=true] - Load image using cross origin */ -export default class VideoResource extends BaseImageResource +export class VideoResource extends BaseImageResource { constructor(source, options) { diff --git a/packages/core/src/textures/resources/autoDetectResource.js b/packages/core/src/textures/resources/autoDetectResource.js index 157f2e2..446fe60 100644 --- a/packages/core/src/textures/resources/autoDetectResource.js +++ b/packages/core/src/textures/resources/autoDetectResource.js @@ -1,4 +1,4 @@ -import ImageResource from './ImageResource'; +import { ImageResource } from './ImageResource'; /** * Collection of installed resource types, class must extend {@link PIXI.resources.Resource}. diff --git a/packages/core/src/textures/resources/index.js b/packages/core/src/textures/resources/index.js index 491085b..58cfc8e 100644 --- a/packages/core/src/textures/resources/index.js +++ b/packages/core/src/textures/resources/index.js @@ -1,12 +1,12 @@ import { INSTALLED, autoDetectResource } from './autoDetectResource'; -import ArrayResource from './ArrayResource'; -import BufferResource from './BufferResource'; -import CanvasResource from './CanvasResource'; -import CubeResource from './CubeResource'; -import ImageResource from './ImageResource'; -import SVGResource from './SVGResource'; -import VideoResource from './VideoResource'; -import ImageBitmapResource from './ImageBitmapResource'; +import { ArrayResource } from './ArrayResource'; +import { BufferResource } from './BufferResource'; +import { CanvasResource } from './CanvasResource'; +import { CubeResource } from './CubeResource'; +import { ImageResource } from './ImageResource'; +import { SVGResource } from './SVGResource'; +import { VideoResource } from './VideoResource'; +import { ImageBitmapResource } from './ImageBitmapResource'; /** * Collection of base resource types supported by PixiJS. @@ -19,8 +19,8 @@ * const baseTexture = PIXI.BaseTexture.from('path/to/image.jpg'); * @namespace PIXI.resources */ -export { default as Resource } from './Resource'; -export { default as BaseImageResource } from './BaseImageResource'; +export * from './Resource'; +export * from './BaseImageResource'; INSTALLED.push( ImageResource, diff --git a/packages/core/src/utils/Quad.js b/packages/core/src/utils/Quad.js index 0c5eba3..126c246 100644 --- a/packages/core/src/utils/Quad.js +++ b/packages/core/src/utils/Quad.js @@ -1,4 +1,4 @@ -import Geometry from '../geometry/Geometry'; +import { Geometry } from '../geometry/Geometry'; /** * Helper class to create a quad @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class Quad extends Geometry +export class Quad extends Geometry { constructor() { diff --git a/packages/core/src/utils/QuadUv.js b/packages/core/src/utils/QuadUv.js index e44eed1..09a5fcd 100644 --- a/packages/core/src/utils/QuadUv.js +++ b/packages/core/src/utils/QuadUv.js @@ -1,5 +1,5 @@ -import Geometry from '../geometry/Geometry'; -import Buffer from '../geometry/Buffer'; +import { Geometry } from '../geometry/Geometry'; +import { Buffer } from '../geometry/Buffer'; /** * Helper class to create a quad with uvs like in v4 @@ -8,7 +8,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class QuadUv extends Geometry +export class QuadUv extends Geometry { constructor() { diff --git a/packages/display/src/Bounds.js b/packages/display/src/Bounds.js index 1da4c70..b061eec 100644 --- a/packages/display/src/Bounds.js +++ b/packages/display/src/Bounds.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class Bounds +export class Bounds { constructor() { diff --git a/packages/display/src/Container.js b/packages/display/src/Container.js index d1fe448..357734e 100644 --- a/packages/display/src/Container.js +++ b/packages/display/src/Container.js @@ -1,6 +1,6 @@ import { settings } from '@pixi/settings'; import { removeItems } from '@pixi/utils'; -import DisplayObject from './DisplayObject'; +import { DisplayObject } from './DisplayObject'; function sortChildren(a, b) { @@ -26,7 +26,7 @@ * @extends PIXI.DisplayObject * @memberof PIXI */ -export default class Container extends DisplayObject +export class Container extends DisplayObject { constructor() { diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 4804fbe..685b8f3 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,6 +1,6 @@ import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; -import Bounds from './Bounds'; +import { Bounds } from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); /** @@ -12,7 +12,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI */ -export default class DisplayObject extends EventEmitter +export class DisplayObject extends EventEmitter { /** * Mixes all enumerable properties and methods from a source object to DisplayObject. diff --git a/packages/display/src/index.js b/packages/display/src/index.js index 48acb62..21123db 100644 --- a/packages/display/src/index.js +++ b/packages/display/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Bounds } from './Bounds'; -export { default as DisplayObject } from './DisplayObject'; -export { default as Container } from './Container'; +export * from './Bounds'; +export * from './DisplayObject'; +export * from './Container'; diff --git a/packages/extract/src/Extract.js b/packages/extract/src/Extract.js index e79f2d4..189fb2e 100644 --- a/packages/extract/src/Extract.js +++ b/packages/extract/src/Extract.js @@ -13,7 +13,7 @@ * @class * @memberof PIXI.extract */ -export default class Extract +export class Extract { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/extract/src/index.js b/packages/extract/src/index.js index 53b8da9..6d204ea 100644 --- a/packages/extract/src/index.js +++ b/packages/extract/src/index.js @@ -18,4 +18,4 @@ * document.body.appendChild(image); * @namespace PIXI.extract */ -export { default as Extract } from './Extract'; +export * from './Extract'; diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 343e3c1..cb378be 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -18,7 +18,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class AlphaFilter extends Filter +export class AlphaFilter extends Filter { /** * @param {number} [alpha=1] Amount of alpha from 0 to 1, where 0 is transparent diff --git a/packages/filters/filter-alpha/src/index.js b/packages/filters/filter-alpha/src/index.js index 0160487..0333b1c 100644 --- a/packages/filters/filter-alpha/src/index.js +++ b/packages/filters/filter-alpha/src/index.js @@ -1 +1 @@ -export { default as AlphaFilter } from './AlphaFilter'; +export * from './AlphaFilter'; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index 6837bd8..51b5ed8 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -1,6 +1,6 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import BlurFilterPass from './BlurFilterPass'; +import { BlurFilterPass } from './BlurFilterPass'; /** * The BlurFilter applies a Gaussian blur to an object. @@ -11,7 +11,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilter extends Filter +export class BlurFilter extends Filter { /** * @param {number} [strength=8] - The strength of the blur filter. diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 652469d..2afc2d8 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -1,7 +1,7 @@ import { Filter } from '@pixi/core'; import { settings } from '@pixi/settings'; -import generateBlurVertSource from './generateBlurVertSource'; -import generateBlurFragSource from './generateBlurFragSource'; +import { generateBlurVertSource } from './generateBlurVertSource'; +import { generateBlurFragSource } from './generateBlurFragSource'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -10,7 +10,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class BlurFilterPass extends Filter +export class BlurFilterPass extends Filter { /** * @param {boolean} horizontal - Do pass along the x-axis (`true`) or y-axis (`false`). diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a8aa5af..549008f 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateBlurFragSource(kernelSize) +export function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 57b31de..81d8824 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -9,14 +9,14 @@ uniform vec4 inputSize; uniform vec4 outputFrame; - + vec4 filterVertexPosition( void ) { vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); } - + vec2 filterTextureCoord( void ) { return aVertexPosition * (outputFrame.zw * inputSize.zw); @@ -30,7 +30,7 @@ %blur% }`; -export default function generateBlurVertSource(kernelSize, x) +export function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2); diff --git a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js index c29ff87..00d336b 100644 --- a/packages/filters/filter-blur/src/getMaxBlurKernelSize.js +++ b/packages/filters/filter-blur/src/getMaxBlurKernelSize.js @@ -1,4 +1,4 @@ -export default function getMaxKernelSize(gl) +export function getMaxKernelSize(gl) { const maxVaryings = (gl.getParameter(gl.MAX_VARYING_VECTORS)); let kernelSize = 15; diff --git a/packages/filters/filter-blur/src/index.js b/packages/filters/filter-blur/src/index.js index 14d486f..c86bb0d 100644 --- a/packages/filters/filter-blur/src/index.js +++ b/packages/filters/filter-blur/src/index.js @@ -1,2 +1,2 @@ -export { default as BlurFilter } from './BlurFilter'; -export { default as BlurFilterPass } from './BlurFilterPass'; +export * from './BlurFilter'; +export * from './BlurFilterPass'; diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index 5be34a7..a04ccd5 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -16,7 +16,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class ColorMatrixFilter extends Filter +export class ColorMatrixFilter extends Filter { constructor() { diff --git a/packages/filters/filter-color-matrix/src/index.js b/packages/filters/filter-color-matrix/src/index.js index 5580ba2..bc4116d 100644 --- a/packages/filters/filter-color-matrix/src/index.js +++ b/packages/filters/filter-color-matrix/src/index.js @@ -1 +1 @@ -export { default as ColorMatrixFilter } from './ColorMatrixFilter'; +export * from './ColorMatrixFilter'; diff --git a/packages/filters/filter-displacement/src/DisplacementFilter.js b/packages/filters/filter-displacement/src/DisplacementFilter.js index 65086c3..b3e0e63 100644 --- a/packages/filters/filter-displacement/src/DisplacementFilter.js +++ b/packages/filters/filter-displacement/src/DisplacementFilter.js @@ -21,7 +21,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class DisplacementFilter extends Filter +export class DisplacementFilter extends Filter { /** * @param {PIXI.Sprite} sprite - The sprite used for the displacement map. (make sure its added to the scene!) diff --git a/packages/filters/filter-displacement/src/index.js b/packages/filters/filter-displacement/src/index.js index 022a477..d8340cf 100644 --- a/packages/filters/filter-displacement/src/index.js +++ b/packages/filters/filter-displacement/src/index.js @@ -1 +1 @@ -export { default as DisplacementFilter } from './DisplacementFilter'; +export * from './DisplacementFilter'; diff --git a/packages/filters/filter-fxaa/src/FXAAFilter.js b/packages/filters/filter-fxaa/src/FXAAFilter.js index 0ac7d72..44a4e3f 100644 --- a/packages/filters/filter-fxaa/src/FXAAFilter.js +++ b/packages/filters/filter-fxaa/src/FXAAFilter.js @@ -13,7 +13,7 @@ * @memberof PIXI.filters * */ -export default class FXAAFilter extends Filter +export class FXAAFilter extends Filter { constructor() { diff --git a/packages/filters/filter-fxaa/src/index.js b/packages/filters/filter-fxaa/src/index.js index d05e933..eef2adb 100644 --- a/packages/filters/filter-fxaa/src/index.js +++ b/packages/filters/filter-fxaa/src/index.js @@ -1 +1 @@ -export { default as FXAAFilter } from './FXAAFilter'; +export * from './FXAAFilter'; diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 497df85..1fa74cc 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -13,7 +13,7 @@ * @extends PIXI.Filter * @memberof PIXI.filters */ -export default class NoiseFilter extends Filter +export class NoiseFilter extends Filter { /** * @param {number} [noise=0.5] - The noise intensity, should be a normalized value in the range [0, 1]. diff --git a/packages/filters/filter-noise/src/index.js b/packages/filters/filter-noise/src/index.js index 947eb11..18febfd 100644 --- a/packages/filters/filter-noise/src/index.js +++ b/packages/filters/filter-noise/src/index.js @@ -1 +1 @@ -export { default as NoiseFilter } from './NoiseFilter'; +export * from './NoiseFilter'; diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 857de22..cec6094 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -14,13 +14,13 @@ Shader, UniformGroup, State, } from '@pixi/core'; -import FillStyle from './styles/FillStyle'; -import GraphicsGeometry from './GraphicsGeometry'; -import LineStyle from './styles/LineStyle'; -import BezierUtils from './utils/BezierUtils'; -import QuadraticUtils from './utils/QuadraticUtils'; -import ArcUtils from './utils/ArcUtils'; -import Star from './utils/Star'; +import { FillStyle } from './styles/FillStyle'; +import { GraphicsGeometry } from './GraphicsGeometry'; +import { LineStyle } from './styles/LineStyle'; +import { BezierUtils } from './utils/BezierUtils'; +import { QuadraticUtils } from './utils/QuadraticUtils'; +import { ArcUtils } from './utils/ArcUtils'; +import { Star } from './utils/Star'; import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; @@ -42,7 +42,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Graphics extends Container +export class Graphics extends Container { /** * @param {PIXI.GraphicsGeometry} [geometry=null] - Geometry to use, if omitted diff --git a/packages/graphics/src/GraphicsData.js b/packages/graphics/src/GraphicsData.js index 8f6cae2..24e9c36 100644 --- a/packages/graphics/src/GraphicsData.js +++ b/packages/graphics/src/GraphicsData.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class GraphicsData +export class GraphicsData { /** * diff --git a/packages/graphics/src/GraphicsGeometry.js b/packages/graphics/src/GraphicsGeometry.js index 29aea22..7422c27 100644 --- a/packages/graphics/src/GraphicsGeometry.js +++ b/packages/graphics/src/GraphicsGeometry.js @@ -3,12 +3,12 @@ import { BatchGeometry, BatchDrawCall, BaseTexture } from '@pixi/core'; import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import GraphicsData from './GraphicsData'; -import buildCircle from './utils/buildCircle'; -import buildLine from './utils/buildLine'; -import buildPoly from './utils/buildPoly'; -import buildRectangle from './utils/buildRectangle'; -import buildRoundedRectangle from './utils/buildRoundedRectangle'; +import { GraphicsData } from './GraphicsData'; +import { buildCircle } from './utils/buildCircle'; +import { buildLine } from './utils/buildLine'; +import { buildPoly } from './utils/buildPoly'; +import { buildRectangle } from './utils/buildRectangle'; +import { buildRoundedRectangle } from './utils/buildRoundedRectangle'; import { premultiplyTint } from '@pixi/utils'; const BATCH_POOL = []; @@ -58,7 +58,7 @@ * @extends PIXI.BatchGeometry * @memberof PIXI */ -export default class GraphicsGeometry extends BatchGeometry +export class GraphicsGeometry extends BatchGeometry { constructor() { diff --git a/packages/graphics/src/index.js b/packages/graphics/src/index.js index e87e053..5027fd0 100644 --- a/packages/graphics/src/index.js +++ b/packages/graphics/src/index.js @@ -1,6 +1,6 @@ export * from './const'; -export { default as FillStyle } from './styles/FillStyle'; -export { default as Graphics } from './Graphics'; -export { default as GraphicsData } from './GraphicsData'; -export { default as GraphicsGeometry } from './GraphicsGeometry'; -export { default as LineStyle } from './styles/LineStyle'; +export * from './styles/FillStyle'; +export * from './Graphics'; +export * from './GraphicsData'; +export * from './GraphicsGeometry'; +export * from './styles/LineStyle'; diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 7e6aca7..4cd8ed3 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI */ -export default class FillStyle +export class FillStyle { constructor() { diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index b746069..ca62a4c 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -1,4 +1,4 @@ -import FillStyle from './FillStyle'; +import { FillStyle } from './FillStyle'; /** * Represents the line style for Graphics. @@ -6,7 +6,7 @@ * @class * @extends PIXI.FillStyle */ -export default class LineStyle extends FillStyle +export class LineStyle extends FillStyle { /** * Clones the object diff --git a/packages/graphics/src/utils/ArcUtils.js b/packages/graphics/src/utils/ArcUtils.js index 384851c..c874609 100644 --- a/packages/graphics/src/utils/ArcUtils.js +++ b/packages/graphics/src/utils/ArcUtils.js @@ -6,7 +6,7 @@ * @class * @private */ -export default class ArcUtils +export class ArcUtils { /** * The arcTo() method creates an arc/curve between two tangents on the canvas. diff --git a/packages/graphics/src/utils/BezierUtils.js b/packages/graphics/src/utils/BezierUtils.js index eb78ee5..72d789b 100644 --- a/packages/graphics/src/utils/BezierUtils.js +++ b/packages/graphics/src/utils/BezierUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class BezierUtils +export class BezierUtils { /** * Calculate length of bezier curve. diff --git a/packages/graphics/src/utils/QuadraticUtils.js b/packages/graphics/src/utils/QuadraticUtils.js index c15511c..ead9f48 100644 --- a/packages/graphics/src/utils/QuadraticUtils.js +++ b/packages/graphics/src/utils/QuadraticUtils.js @@ -5,7 +5,7 @@ * @class * @private */ -export default class QuadraticUtils +export class QuadraticUtils { /** * Calculate length of quadratic curve diff --git a/packages/graphics/src/utils/Star.js b/packages/graphics/src/utils/Star.js index 09e26ec..f1b5ca7 100644 --- a/packages/graphics/src/utils/Star.js +++ b/packages/graphics/src/utils/Star.js @@ -14,7 +14,7 @@ * @param {number} [rotation=0] - The rotation of the star in radians, where 0 is vertical * @return {PIXI.Graphics} This Graphics object. Good for chaining method calls */ -export default class Star extends Polygon +export class Star extends Polygon { constructor(x, y, points, radius, innerRadius, rotation) { diff --git a/packages/graphics/src/utils/bezierCurveTo.js b/packages/graphics/src/utils/bezierCurveTo.js index b02e68c..a7bf180 100644 --- a/packages/graphics/src/utils/bezierCurveTo.js +++ b/packages/graphics/src/utils/bezierCurveTo.js @@ -16,7 +16,7 @@ * @param {number[]} [path=[]] - Path array to push points into * @return {number[]} Array of points of the curve */ -export default function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) +export function bezierCurveTo(fromX, fromY, cpX, cpY, cpX2, cpY2, toX, toY, n, path = []) { let dt = 0; let dt2 = 0; diff --git a/packages/graphics/src/utils/buildCircle.js b/packages/graphics/src/utils/buildCircle.js index 00e97f8..f687661 100644 --- a/packages/graphics/src/utils/buildCircle.js +++ b/packages/graphics/src/utils/buildCircle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildCircle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildComplexPoly.js b/packages/graphics/src/utils/buildComplexPoly.js index 9b64b6e..1e6fca9 100644 --- a/packages/graphics/src/utils/buildComplexPoly.js +++ b/packages/graphics/src/utils/buildComplexPoly.js @@ -10,7 +10,7 @@ * @param {PIXI.Graphics} graphicsData - The graphics object containing all the necessary properties * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape */ -export default function buildComplexPoly(graphicsData, webGLData) +export function buildComplexPoly(graphicsData, webGLData) { // TODO - no need to copy this as it gets turned into a Float32Array anyways.. const points = graphicsData.points.slice(); diff --git a/packages/graphics/src/utils/buildLine.js b/packages/graphics/src/utils/buildLine.js index ebb02cd..f7d40db 100644 --- a/packages/graphics/src/utils/buildLine.js +++ b/packages/graphics/src/utils/buildLine.js @@ -10,7 +10,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -export default function (graphicsData, graphicsGeometry) +export function buildLine(graphicsData, graphicsGeometry) { if (graphicsData.lineStyle.native) { @@ -18,7 +18,7 @@ } else { - buildLine(graphicsData, graphicsGeometry); + buildNonNativeLine(graphicsData, graphicsGeometry); } } @@ -32,7 +32,7 @@ * @param {PIXI.GraphicsData} graphicsData - The graphics object containing all the necessary properties * @param {PIXI.GraphicsGeometry} graphicsGeometry - Geometry where to append output */ -function buildLine(graphicsData, graphicsGeometry) +function buildNonNativeLine(graphicsData, graphicsGeometry) { const shape = graphicsData.shape; let points = graphicsData.points || shape.points.slice(); diff --git a/packages/graphics/src/utils/buildPoly.js b/packages/graphics/src/utils/buildPoly.js index 5b0d8fd..234a11e 100644 --- a/packages/graphics/src/utils/buildPoly.js +++ b/packages/graphics/src/utils/buildPoly.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildPoly = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRectangle.js b/packages/graphics/src/utils/buildRectangle.js index 2a974d0..f1af9c9 100644 --- a/packages/graphics/src/utils/buildRectangle.js +++ b/packages/graphics/src/utils/buildRectangle.js @@ -9,7 +9,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRectangle = { build(graphicsData) { diff --git a/packages/graphics/src/utils/buildRoundedRectangle.js b/packages/graphics/src/utils/buildRoundedRectangle.js index 4e4c84b..e38bb9a 100644 --- a/packages/graphics/src/utils/buildRoundedRectangle.js +++ b/packages/graphics/src/utils/buildRoundedRectangle.js @@ -11,7 +11,7 @@ * @param {object} webGLData - an object containing all the WebGL-specific information to create this shape * @param {object} webGLDataNativeLines - an object containing all the WebGL-specific information to create nativeLines */ -export default { +export const buildRoundedRectangle = { build(graphicsData) { diff --git a/packages/interaction/src/InteractionData.js b/packages/interaction/src/InteractionData.js index 2433067..6f7f0f0 100644 --- a/packages/interaction/src/InteractionData.js +++ b/packages/interaction/src/InteractionData.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionData +export class InteractionData { constructor() { diff --git a/packages/interaction/src/InteractionEvent.js b/packages/interaction/src/InteractionEvent.js index 59f602d..73adde1 100644 --- a/packages/interaction/src/InteractionEvent.js +++ b/packages/interaction/src/InteractionEvent.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI.interaction */ -export default class InteractionEvent +export class InteractionEvent { constructor() { diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index e54445d..8661e89 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -1,11 +1,11 @@ import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; import { Point } from '@pixi/math'; import { DisplayObject } from '@pixi/display'; -import InteractionData from './InteractionData'; -import InteractionEvent from './InteractionEvent'; -import InteractionTrackingData from './InteractionTrackingData'; +import { InteractionData } from './InteractionData'; +import { InteractionEvent } from './InteractionEvent'; +import { InteractionTrackingData } from './InteractionTrackingData'; import { EventEmitter } from '@pixi/utils'; -import interactiveTarget from './interactiveTarget'; +import { interactiveTarget } from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, // after deprecation has been handled @@ -34,7 +34,7 @@ * @extends PIXI.utils.EventEmitter * @memberof PIXI.interaction */ -export default class InteractionManager extends EventEmitter +export class InteractionManager extends EventEmitter { /** * @param {PIXI.CanvasRenderer|PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/interaction/src/InteractionTrackingData.js b/packages/interaction/src/InteractionTrackingData.js index 694b220..263fff7 100644 --- a/packages/interaction/src/InteractionTrackingData.js +++ b/packages/interaction/src/InteractionTrackingData.js @@ -5,7 +5,7 @@ * @private * @memberof PIXI.interaction */ -export default class InteractionTrackingData +export class InteractionTrackingData { /** * @param {number} pointerId - Unique pointer id of the event diff --git a/packages/interaction/src/index.js b/packages/interaction/src/index.js index 9e7df89..e29b5cf 100644 --- a/packages/interaction/src/index.js +++ b/packages/interaction/src/index.js @@ -5,8 +5,8 @@ * See {@link PIXI.CanvasRenderer#plugins} or {@link PIXI.Renderer#plugins}. * @namespace PIXI.interaction */ -export { default as InteractionData } from './InteractionData'; -export { default as InteractionManager } from './InteractionManager'; -export { default as interactiveTarget } from './interactiveTarget'; -export { default as InteractionTrackingData } from './InteractionTrackingData'; -export { default as InteractionEvent } from './InteractionEvent'; +export * from './InteractionData'; +export * from './InteractionManager'; +export * from './interactiveTarget'; +export * from './InteractionTrackingData'; +export * from './InteractionEvent'; diff --git a/packages/interaction/src/interactiveTarget.js b/packages/interaction/src/interactiveTarget.js index eb4ce5f..28acc6f 100644 --- a/packages/interaction/src/interactiveTarget.js +++ b/packages/interaction/src/interactiveTarget.js @@ -38,7 +38,7 @@ * PIXI.interaction.interactiveTarget * ); */ -export default { +export const interactiveTarget = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse diff --git a/packages/loaders/src/AppLoaderPlugin.js b/packages/loaders/src/AppLoaderPlugin.js index 5ea8dee..25ae4ed 100644 --- a/packages/loaders/src/AppLoaderPlugin.js +++ b/packages/loaders/src/AppLoaderPlugin.js @@ -1,4 +1,4 @@ -import Loader from './Loader'; +import { Loader } from './Loader'; /** * Application plugin for supporting loader option. Installing the LoaderPlugin @@ -10,7 +10,7 @@ * @class * @memberof PIXI */ -export default class AppLoaderPlugin +export class AppLoaderPlugin { /** * Called on application constructor diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index cdc1c10..0ddd9a7 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,6 +1,6 @@ import { Loader as ResourceLoader, middleware } from 'resource-loader'; import { EventEmitter } from '@pixi/utils'; -import TextureLoader from './TextureLoader'; +import { TextureLoader } from './TextureLoader'; /** * The new loader, extends Resource Loader by Chad Engler: https://github.com/englercj/resource-loader @@ -53,7 +53,7 @@ * @param {string} [baseUrl=''] - The base url for all resources loaded by this loader. * @param {number} [concurrency=10] - The number of resources to load concurrently. */ -export default class Loader extends ResourceLoader +export class Loader extends ResourceLoader { constructor(baseUrl, concurrency) { diff --git a/packages/loaders/src/TextureLoader.js b/packages/loaders/src/TextureLoader.js index 3b1d682..f8d298c 100644 --- a/packages/loaders/src/TextureLoader.js +++ b/packages/loaders/src/TextureLoader.js @@ -7,7 +7,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class TextureLoader +export class TextureLoader { /** * Called after a resource is loaded. diff --git a/packages/loaders/src/index.js b/packages/loaders/src/index.js index 278f871..5e33a73 100644 --- a/packages/loaders/src/index.js +++ b/packages/loaders/src/index.js @@ -7,6 +7,6 @@ * @memberof PIXI */ export const LoaderResource = Resource; -export { default as Loader } from './Loader'; -export { default as TextureLoader } from './TextureLoader'; -export { default as AppLoaderPlugin } from './AppLoaderPlugin'; +export * from './Loader'; +export * from './TextureLoader'; +export * from './AppLoaderPlugin'; diff --git a/packages/math/src/GroupD8.js b/packages/math/src/GroupD8.js index df87332..513cea8 100644 --- a/packages/math/src/GroupD8.js +++ b/packages/math/src/GroupD8.js @@ -3,7 +3,7 @@ // This file implements the dihedral group of order 16, also called // of degree 8. That's why its called GroupD8. -import Matrix from './Matrix'; +import { Matrix } from './Matrix'; /* * Transform matrix for operation n is: @@ -110,15 +110,16 @@ * @see PIXI.GroupD8.N * @see PIXI.GroupD8.NE * @author Ivan @ivanpopelyshev - * @class + * @namespace PIXI.GroupD8 * @memberof PIXI */ -const GroupD8 = { +export const GroupD8 = { /** * | Rotation | Direction | * |----------|-----------| * | 0° | East | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ E: 0, @@ -128,6 +129,7 @@ * |----------|-----------| * | 45°↻ | Southeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SE: 1, @@ -137,6 +139,7 @@ * |----------|-----------| * | 90°↻ | South | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ S: 2, @@ -146,6 +149,7 @@ * |----------|-----------| * | 135°↻ | Southwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ SW: 3, @@ -155,6 +159,7 @@ * |----------|-----------| * | 180° | West | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ W: 4, @@ -164,6 +169,7 @@ * |-------------|--------------| * | -135°/225°↻ | Northwest | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NW: 5, @@ -173,6 +179,7 @@ * |-------------|--------------| * | -90°/270°↻ | North | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ N: 6, @@ -182,6 +189,7 @@ * |-------------|--------------| * | -45°/315°↻ | Northeast | * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ NE: 7, @@ -189,6 +197,7 @@ /** * Reflection about Y-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_VERTICAL: 8, @@ -196,6 +205,7 @@ /** * Reflection about the main diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MAIN_DIAGONAL: 10, @@ -203,6 +213,7 @@ /** * Reflection about X-axis. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ MIRROR_HORIZONTAL: 12, @@ -210,6 +221,7 @@ /** * Reflection about reverse diagonal. * + * @memberof PIXI.GroupD8 * @constant {PIXI.GD8Symmetry} */ REVERSE_DIAGONAL: 14, @@ -389,5 +401,3 @@ matrix.append(mat); }, }; - -export default GroupD8; diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 5b68628..0775466 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -1,4 +1,4 @@ -import Point from './Point'; +import { Point } from './Point'; import { PI_2 } from './const'; /** @@ -13,7 +13,7 @@ * @class * @memberof PIXI */ -export default class Matrix +export class Matrix { /** * @param {number} [a=1] - x scale diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index 57d9d4a..b7a0e4e 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class ObservablePoint +export class ObservablePoint { /** * @param {Function} cb - callback when changed diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index 954a09e..cf9add9 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class Point +export class Point { /** * @param {number} [x=0] - position of the point on the x axis diff --git a/packages/math/src/Transform.js b/packages/math/src/Transform.js index a6dd8a8..04eb75b 100644 --- a/packages/math/src/Transform.js +++ b/packages/math/src/Transform.js @@ -1,5 +1,5 @@ -import ObservablePoint from './ObservablePoint'; -import Matrix from './Matrix'; +import { ObservablePoint } from './ObservablePoint'; +import { Matrix } from './Matrix'; /** * Transform that takes care about its versions @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Transform +export class Transform { constructor() { diff --git a/packages/math/src/index.js b/packages/math/src/index.js index a8ad9fd..4ff1eef 100644 --- a/packages/math/src/index.js +++ b/packages/math/src/index.js @@ -3,15 +3,15 @@ * * @lends PIXI */ -export { default as Point } from './Point'; -export { default as ObservablePoint } from './ObservablePoint'; -export { default as Matrix } from './Matrix'; -export { default as GroupD8 } from './GroupD8'; -export { default as Transform } from './Transform'; -export { default as Circle } from './shapes/Circle'; -export { default as Ellipse } from './shapes/Ellipse'; -export { default as Polygon } from './shapes/Polygon'; -export { default as Rectangle } from './shapes/Rectangle'; -export { default as RoundedRectangle } from './shapes/RoundedRectangle'; +export * from './Point'; +export * from './ObservablePoint'; +export * from './Matrix'; +export * from './GroupD8'; +export * from './Transform'; +export * from './shapes/Circle'; +export * from './shapes/Ellipse'; +export * from './shapes/Polygon'; +export * from './shapes/Rectangle'; +export * from './shapes/RoundedRectangle'; export * from './const'; diff --git a/packages/math/src/shapes/Circle.js b/packages/math/src/shapes/Circle.js index 3d39c6f..c2617af 100644 --- a/packages/math/src/shapes/Circle.js +++ b/packages/math/src/shapes/Circle.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Circle +export class Circle { /** * @param {number} [x=0] - The X coordinate of the center of this circle diff --git a/packages/math/src/shapes/Ellipse.js b/packages/math/src/shapes/Ellipse.js index c992d72..08b7629 100644 --- a/packages/math/src/shapes/Ellipse.js +++ b/packages/math/src/shapes/Ellipse.js @@ -1,4 +1,4 @@ -import Rectangle from './Rectangle'; +import { Rectangle } from './Rectangle'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Ellipse +export class Ellipse { /** * @param {number} [x=0] - The X coordinate of the center of this ellipse diff --git a/packages/math/src/shapes/Polygon.js b/packages/math/src/shapes/Polygon.js index 82f65db..1e6f350 100644 --- a/packages/math/src/shapes/Polygon.js +++ b/packages/math/src/shapes/Polygon.js @@ -1,4 +1,4 @@ -import Point from '../Point'; +import { Point } from '../Point'; import { SHAPES } from '../const'; /** @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class Polygon +export class Polygon { /** * @param {PIXI.Point[]|number[]} points - This can be an array of Points diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 5315210..2a7ec51 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -16,7 +16,7 @@ * @class * @memberof PIXI */ -export default class Rectangle +export class Rectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rectangle diff --git a/packages/math/src/shapes/RoundedRectangle.js b/packages/math/src/shapes/RoundedRectangle.js index 793c9dc..5b6cdb7 100644 --- a/packages/math/src/shapes/RoundedRectangle.js +++ b/packages/math/src/shapes/RoundedRectangle.js @@ -7,7 +7,7 @@ * @class * @memberof PIXI */ -export default class RoundedRectangle +export class RoundedRectangle { /** * @param {number} [x=0] - The X coordinate of the upper-left corner of the rounded rectangle diff --git a/packages/mesh-extras/src/NineSlicePlane.js b/packages/mesh-extras/src/NineSlicePlane.js index da6cae5..df0fb3c 100644 --- a/packages/mesh-extras/src/NineSlicePlane.js +++ b/packages/mesh-extras/src/NineSlicePlane.js @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import SimplePlane from './SimplePlane'; +import { SimplePlane } from './SimplePlane'; const DEFAULT_BORDER_SIZE = 10; @@ -34,7 +34,7 @@ * @memberof PIXI * */ -export default class NineSlicePlane extends SimplePlane +export class NineSlicePlane extends SimplePlane { /** * @param {PIXI.Texture} texture - The texture to use on the NineSlicePlane. diff --git a/packages/mesh-extras/src/SimpleMesh.js b/packages/mesh-extras/src/SimpleMesh.js index 77194fb..d23354c 100644 --- a/packages/mesh-extras/src/SimpleMesh.js +++ b/packages/mesh-extras/src/SimpleMesh.js @@ -9,7 +9,7 @@ * @extends PIXI.Mesh * @memberof PIXI */ -export default class SimpleMesh extends Mesh +export class SimpleMesh extends Mesh { /** * @param {PIXI.Texture} [texture=Texture.EMPTY] - The texture to use diff --git a/packages/mesh-extras/src/SimplePlane.js b/packages/mesh-extras/src/SimplePlane.js index 3fb0fe5..9bc6409 100644 --- a/packages/mesh-extras/src/SimplePlane.js +++ b/packages/mesh-extras/src/SimplePlane.js @@ -1,6 +1,6 @@ import { Texture } from '@pixi/core'; import { Mesh, MeshMaterial } from '@pixi/mesh'; -import PlaneGeometry from './geometry/PlaneGeometry'; +import { PlaneGeometry } from './geometry/PlaneGeometry'; /** * The SimplePlane allows you to draw a texture across several points and then manipulate these points @@ -17,7 +17,7 @@ * @memberof PIXI * */ -export default class SimplePlane extends Mesh +export class SimplePlane extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the SimplePlane. diff --git a/packages/mesh-extras/src/SimpleRope.js b/packages/mesh-extras/src/SimpleRope.js index ec49daa..66df525 100644 --- a/packages/mesh-extras/src/SimpleRope.js +++ b/packages/mesh-extras/src/SimpleRope.js @@ -1,5 +1,5 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import RopeGeometry from './geometry/RopeGeometry'; +import { RopeGeometry } from './geometry/RopeGeometry'; /** * The rope allows you to draw a texture across several points and then manipulate these points @@ -16,7 +16,7 @@ * @memberof PIXI * */ -export default class SimpleRope extends Mesh +export class SimpleRope extends Mesh { /** * @param {PIXI.Texture} texture - The texture to use on the rope. diff --git a/packages/mesh-extras/src/geometry/PlaneGeometry.js b/packages/mesh-extras/src/geometry/PlaneGeometry.js index 8049e71..0d7263a 100644 --- a/packages/mesh-extras/src/geometry/PlaneGeometry.js +++ b/packages/mesh-extras/src/geometry/PlaneGeometry.js @@ -1,6 +1,6 @@ import { MeshGeometry } from '@pixi/mesh'; -export default class PlaneGeometry extends MeshGeometry +export class PlaneGeometry extends MeshGeometry { constructor(width = 100, height = 100, segWidth = 10, segHeight = 10) { diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.js b/packages/mesh-extras/src/geometry/RopeGeometry.js index cfe24aa..c16297d 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.js +++ b/packages/mesh-extras/src/geometry/RopeGeometry.js @@ -14,7 +14,7 @@ * @memberof PIXI * */ -export default class RopeGeometry extends MeshGeometry +export class RopeGeometry extends MeshGeometry { /** * @param {number} [width=200] - The width (i.e., thickness) of the rope. diff --git a/packages/mesh-extras/src/index.js b/packages/mesh-extras/src/index.js index adc467f..9b67ed9 100644 --- a/packages/mesh-extras/src/index.js +++ b/packages/mesh-extras/src/index.js @@ -1,6 +1,6 @@ -export { default as PlaneGeometry } from './geometry/PlaneGeometry'; -export { default as RopeGeometry } from './geometry/RopeGeometry'; -export { default as SimpleRope } from './SimpleRope'; -export { default as SimplePlane } from './SimplePlane'; -export { default as SimpleMesh } from './SimpleMesh'; -export { default as NineSlicePlane } from './NineSlicePlane'; +export * from './geometry/PlaneGeometry'; +export * from './geometry/RopeGeometry'; +export * from './SimpleRope'; +export * from './SimplePlane'; +export * from './SimpleMesh'; +export * from './NineSlicePlane'; diff --git a/packages/mesh/src/Mesh.js b/packages/mesh/src/Mesh.js index dd9eb7c..d85ff1e 100644 --- a/packages/mesh/src/Mesh.js +++ b/packages/mesh/src/Mesh.js @@ -3,7 +3,7 @@ import { BLEND_MODES, DRAW_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; import { settings } from '@pixi/settings'; -import MeshBatchUvs from './MeshBatchUvs'; +import { MeshBatchUvs } from './MeshBatchUvs'; const tempPoint = new Point(); const tempPolygon = new Polygon(); @@ -26,7 +26,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Mesh extends Container +export class Mesh extends Container { /** * @param {PIXI.Geometry} geometry the geometry the mesh will use diff --git a/packages/mesh/src/MeshBatchUvs.js b/packages/mesh/src/MeshBatchUvs.js index 4fce153..f808884 100644 --- a/packages/mesh/src/MeshBatchUvs.js +++ b/packages/mesh/src/MeshBatchUvs.js @@ -4,7 +4,7 @@ * @class * @memberof PIXI */ -export default class MeshBatchUvs +export class MeshBatchUvs { /** * @param {PIXI.Buffer} uvBuffer - Buffer with normalized uv's diff --git a/packages/mesh/src/MeshGeometry.js b/packages/mesh/src/MeshGeometry.js index ae6c702..86f4d46 100644 --- a/packages/mesh/src/MeshGeometry.js +++ b/packages/mesh/src/MeshGeometry.js @@ -18,7 +18,7 @@ * @memberof PIXI * @extends PIXI.Geometry */ -export default class MeshGeometry extends Geometry +export class MeshGeometry extends Geometry { /** * @param {Float32Array|number[]} vertices - Positional data on geometry. diff --git a/packages/mesh/src/MeshMaterial.js b/packages/mesh/src/MeshMaterial.js index 6d74a2e..44e23ad 100644 --- a/packages/mesh/src/MeshMaterial.js +++ b/packages/mesh/src/MeshMaterial.js @@ -10,7 +10,7 @@ * @memberof PIXI * @extends PIXI.Shader */ -export default class MeshMaterial extends Shader +export class MeshMaterial extends Shader { /** * @param {PIXI.Texture} uSampler - Texture that material uses to render. diff --git a/packages/mesh/src/index.js b/packages/mesh/src/index.js index c6a1197..66a36fd 100644 --- a/packages/mesh/src/index.js +++ b/packages/mesh/src/index.js @@ -1,4 +1,4 @@ -export { default as Mesh } from './Mesh'; -export { default as MeshBatchUvs } from './MeshBatchUvs'; -export { default as MeshMaterial } from './MeshMaterial'; -export { default as MeshGeometry } from './MeshGeometry'; +export * from './Mesh'; +export * from './MeshBatchUvs'; +export * from './MeshMaterial'; +export * from './MeshGeometry'; diff --git a/packages/particles/src/ParticleBuffer.js b/packages/particles/src/ParticleBuffer.js index f3d2566..bbcb880 100644 --- a/packages/particles/src/ParticleBuffer.js +++ b/packages/particles/src/ParticleBuffer.js @@ -21,7 +21,7 @@ * @private * @memberof PIXI */ -export default class ParticleBuffer +export class ParticleBuffer { /** * @private diff --git a/packages/particles/src/ParticleContainer.js b/packages/particles/src/ParticleContainer.js index 0cfb05f..f832a77 100644 --- a/packages/particles/src/ParticleContainer.js +++ b/packages/particles/src/ParticleContainer.js @@ -29,7 +29,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class ParticleContainer extends Container +export class ParticleContainer extends Container { /** * @param {number} [maxSize=1500] - The maximum number of particles that can be rendered by the container. diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index d5e4c03..9328835 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -2,7 +2,7 @@ import { ObjectRenderer, Shader } from '@pixi/core'; import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; import { Matrix } from '@pixi/math'; -import ParticleBuffer from './ParticleBuffer'; +import { ParticleBuffer } from './ParticleBuffer'; import vertex from './particles.vert'; import fragment from './particles.frag'; @@ -24,7 +24,7 @@ * @class * @memberof PIXI */ -export default class ParticleRenderer extends ObjectRenderer +export class ParticleRenderer extends ObjectRenderer { /** * @param {PIXI.Renderer} renderer - The renderer this sprite batch works for. diff --git a/packages/particles/src/index.js b/packages/particles/src/index.js index d315119..55fbab7 100644 --- a/packages/particles/src/index.js +++ b/packages/particles/src/index.js @@ -1,2 +1,2 @@ -export { default as ParticleContainer } from './ParticleContainer'; -export { default as ParticleRenderer } from './ParticleRenderer'; +export * from './ParticleContainer'; +export * from './ParticleRenderer'; diff --git a/packages/prepare/src/BasePrepare.js b/packages/prepare/src/BasePrepare.js index fbe08ac..010fae8 100644 --- a/packages/prepare/src/BasePrepare.js +++ b/packages/prepare/src/BasePrepare.js @@ -3,7 +3,7 @@ import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; -import CountLimiter from './CountLimiter'; +import { CountLimiter } from './CountLimiter'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -28,7 +28,7 @@ * @class * @memberof PIXI.prepare */ -export default class BasePrepare +export class BasePrepare { /** * @param {PIXI.AbstractRenderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/CountLimiter.js b/packages/prepare/src/CountLimiter.js index a73ef14..01787a1 100644 --- a/packages/prepare/src/CountLimiter.js +++ b/packages/prepare/src/CountLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class CountLimiter +export class CountLimiter { /** * @param {number} maxItemsPerFrame - The maximum number of items that can be prepared each frame. diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index ba6ed92..33492e0 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -1,6 +1,6 @@ import { BaseTexture } from '@pixi/core'; import { Graphics } from '@pixi/graphics'; -import BasePrepare from './BasePrepare'; +import { BasePrepare } from './BasePrepare'; /** * The prepare manager provides functionality to upload content to the GPU. @@ -11,7 +11,7 @@ * @extends PIXI.prepare.BasePrepare * @memberof PIXI.prepare */ -export default class Prepare extends BasePrepare +export class Prepare extends BasePrepare { /** * @param {PIXI.Renderer} renderer - A reference to the current renderer diff --git a/packages/prepare/src/TimeLimiter.js b/packages/prepare/src/TimeLimiter.js index 89d7b04..a6a9ea9 100644 --- a/packages/prepare/src/TimeLimiter.js +++ b/packages/prepare/src/TimeLimiter.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI.prepare */ -export default class TimeLimiter +export class TimeLimiter { /** * @param {number} maxMilliseconds - The maximum milliseconds that can be spent preparing items each frame. diff --git a/packages/prepare/src/index.js b/packages/prepare/src/index.js index 893fdab..800aea6 100644 --- a/packages/prepare/src/index.js +++ b/packages/prepare/src/index.js @@ -28,7 +28,7 @@ */ import './settings'; -export { default as Prepare } from './Prepare'; -export { default as BasePrepare } from './BasePrepare'; -export { default as CountLimiter } from './CountLimiter'; -export { default as TimeLimiter } from './TimeLimiter'; +export * from './Prepare'; +export * from './BasePrepare'; +export * from './CountLimiter'; +export * from './TimeLimiter'; diff --git a/packages/runner/src/Runner.js b/packages/runner/src/Runner.js index 3c645a4..fa63f4d 100644 --- a/packages/runner/src/Runner.js +++ b/packages/runner/src/Runner.js @@ -39,7 +39,7 @@ * @class * @memberof PIXI */ -export default class Runner +export class Runner { /** * @param {string} name the function name that will be executed on the listeners added to this Runner. diff --git a/packages/runner/src/index.js b/packages/runner/src/index.js index 2bc89c3..ceb7038 100644 --- a/packages/runner/src/index.js +++ b/packages/runner/src/index.js @@ -1 +1 @@ -export { default as Runner } from './Runner'; +export * from './Runner'; diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 5430d39..a5afd24 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1,2 +1,2 @@ -export { default as settings } from './settings'; +export * from './settings'; export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 9356ddb..63fc97b 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,6 +1,6 @@ import isMobile from 'ismobilejs'; -import maxRecommendedTextures from './utils/maxRecommendedTextures'; -import canUploadSameBuffer from './utils/canUploadSameBuffer'; +import { maxRecommendedTextures } from './utils/maxRecommendedTextures'; +import { canUploadSameBuffer } from './utils/canUploadSameBuffer'; /** * User's customizable globals for overriding the default PIXI settings, such @@ -14,7 +14,7 @@ * PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST; * @namespace PIXI.settings */ -export default { +export const settings = { /** * If set to true WebGL will attempt make textures mimpaped by default. diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index dee9a3a..22d9c91 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -8,7 +8,7 @@ * @private * @returns {boolean} */ -export default function canUploadSameBuffer() +export function canUploadSameBuffer() { return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index a8d16bd..7097f25 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -13,7 +13,7 @@ * @param {number} max * @returns {number} */ -export default function maxRecommendedTextures(max) +export function maxRecommendedTextures(max) { let allowMax = true; diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index b934bc5..e80e96a 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -35,7 +35,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class AnimatedSprite extends Sprite +export class AnimatedSprite extends Sprite { /** * @param {PIXI.Texture[]|PIXI.AnimatedSprite.FrameObject[]} textures - An array of {@link PIXI.Texture} or frame diff --git a/packages/sprite-animated/src/index.js b/packages/sprite-animated/src/index.js index 9e36682..765b70c 100644 --- a/packages/sprite-animated/src/index.js +++ b/packages/sprite-animated/src/index.js @@ -1 +1 @@ -export { default as AnimatedSprite } from './AnimatedSprite'; +export * from './AnimatedSprite'; diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 9f381ab..506772a 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -12,7 +12,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class TilingSprite extends Sprite +export class TilingSprite extends Sprite { /** * @param {PIXI.Texture} texture - the texture of the tiling sprite diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.js b/packages/sprite-tiling/src/TilingSpriteRenderer.js index fc29dc3..c09f345 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.js +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.js @@ -16,7 +16,7 @@ * @memberof PIXI * @extends PIXI.ObjectRenderer */ -export default class TilingSpriteRenderer extends ObjectRenderer +export class TilingSpriteRenderer extends ObjectRenderer { /** * constructor for renderer diff --git a/packages/sprite-tiling/src/index.js b/packages/sprite-tiling/src/index.js index 64fa8c9..ab328f2 100644 --- a/packages/sprite-tiling/src/index.js +++ b/packages/sprite-tiling/src/index.js @@ -1,2 +1,2 @@ -export { default as TilingSprite } from './TilingSprite'; -export { default as TilingSpriteRenderer } from './TilingSpriteRenderer'; +export * from './TilingSprite'; +export * from './TilingSpriteRenderer'; diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..a8c9de6 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -34,7 +34,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class Sprite extends Container +export class Sprite extends Container { /** * @param {PIXI.Texture} [texture] - The texture for this sprite. diff --git a/packages/sprite/src/index.js b/packages/sprite/src/index.js index c5179d7..a5699c9 100644 --- a/packages/sprite/src/index.js +++ b/packages/sprite/src/index.js @@ -1 +1 @@ -export { default as Sprite } from './Sprite'; +export * from './Sprite'; diff --git a/packages/spritesheet/src/Spritesheet.js b/packages/spritesheet/src/Spritesheet.js index bf020db..7711a8a 100644 --- a/packages/spritesheet/src/Spritesheet.js +++ b/packages/spritesheet/src/Spritesheet.js @@ -26,7 +26,7 @@ * @class * @memberof PIXI */ -export default class Spritesheet +export class Spritesheet { /** * The maximum number of Textures to build per process. diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 7deb4d1..717675c 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,6 +1,6 @@ import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; -import Spritesheet from './Spritesheet'; +import { Spritesheet } from './Spritesheet'; /** * {@link PIXI.Loader Loader} middleware for loading texture atlases that have been created with @@ -12,7 +12,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class SpritesheetLoader +export class SpritesheetLoader { /** * Called after a resource is loaded. diff --git a/packages/spritesheet/src/index.js b/packages/spritesheet/src/index.js index b9ee1e8..7b35ca9 100644 --- a/packages/spritesheet/src/index.js +++ b/packages/spritesheet/src/index.js @@ -1,2 +1,2 @@ -export { default as Spritesheet } from './Spritesheet'; -export { default as SpritesheetLoader } from './SpritesheetLoader'; +export * from './Spritesheet'; +export * from './SpritesheetLoader'; diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 7234d86..0c2c4ae 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,5 +1,5 @@ import { LoaderResource } from '@pixi/loaders'; -import BitmapText from './BitmapText'; +import { BitmapText } from './BitmapText'; /** * {@link PIXI.Loader Loader} middleware for loading @@ -8,7 +8,7 @@ * @memberof PIXI * @implements PIXI.ILoaderPlugin */ -export default class BitmapFontLoader +export class BitmapFontLoader { /** * Register a BitmapText font from loader resource. diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index b955bd9..8826fbf 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -31,7 +31,7 @@ * @extends PIXI.Container * @memberof PIXI */ -export default class BitmapText extends Container +export class BitmapText extends Container { /** * @param {string} text - A string that you would like the text to display. diff --git a/packages/text-bitmap/src/index.js b/packages/text-bitmap/src/index.js index e5afd2c..7a9c643 100644 --- a/packages/text-bitmap/src/index.js +++ b/packages/text-bitmap/src/index.js @@ -1,2 +1,2 @@ -export { default as BitmapText } from './BitmapText'; -export { default as BitmapFontLoader } from './BitmapFontLoader'; +export * from './BitmapText'; +export * from './BitmapFontLoader'; diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index d46040d..664518b 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -5,8 +5,8 @@ import { Rectangle } from '@pixi/math'; import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; import { TEXT_GRADIENT } from './const'; -import TextStyle from './TextStyle'; -import TextMetrics from './TextMetrics'; +import { TextStyle } from './TextStyle'; +import { TextMetrics } from './TextMetrics'; const defaultDestroyOptions = { texture: true, @@ -39,7 +39,7 @@ * @extends PIXI.Sprite * @memberof PIXI */ -export default class Text extends Sprite +export class Text extends Sprite { /** * @param {string} text - The string that you would like the text to display diff --git a/packages/text/src/TextMetrics.js b/packages/text/src/TextMetrics.js index e61e3c1..ce3e85b 100644 --- a/packages/text/src/TextMetrics.js +++ b/packages/text/src/TextMetrics.js @@ -9,7 +9,7 @@ * @class * @memberof PIXI */ -export default class TextMetrics +export class TextMetrics { /** * @param {string} text - the text that was measured diff --git a/packages/text/src/TextStyle.js b/packages/text/src/TextStyle.js index ecdb691..e11a3cc 100644 --- a/packages/text/src/TextStyle.js +++ b/packages/text/src/TextStyle.js @@ -55,7 +55,7 @@ * @class * @memberof PIXI */ -export default class TextStyle +export class TextStyle { /** * @param {object} [style] - The style parameters diff --git a/packages/text/src/index.js b/packages/text/src/index.js index 5cb4c65..46114dc 100644 --- a/packages/text/src/index.js +++ b/packages/text/src/index.js @@ -1,5 +1,5 @@ -export { default as Text } from './Text'; -export { default as TextStyle } from './TextStyle'; -export { default as TextMetrics } from './TextMetrics'; +export * from './Text'; +export * from './TextStyle'; +export * from './TextMetrics'; export * from './const'; diff --git a/packages/ticker/src/Ticker.js b/packages/ticker/src/Ticker.js index 0047103..0c3854f 100644 --- a/packages/ticker/src/Ticker.js +++ b/packages/ticker/src/Ticker.js @@ -1,6 +1,6 @@ import { settings } from './settings'; import { UPDATE_PRIORITY } from './const'; -import TickerListener from './TickerListener'; +import { TickerListener } from './TickerListener'; /** * A Ticker class that runs an update loop that other objects listen to. @@ -11,7 +11,7 @@ * @class * @memberof PIXI */ -export default class Ticker +export class Ticker { constructor() { diff --git a/packages/ticker/src/TickerListener.js b/packages/ticker/src/TickerListener.js index b6174f3..af7800c 100644 --- a/packages/ticker/src/TickerListener.js +++ b/packages/ticker/src/TickerListener.js @@ -5,7 +5,7 @@ * @class * @memberof PIXI */ -export default class TickerListener +export class TickerListener { /** * Constructor diff --git a/packages/ticker/src/TickerPlugin.js b/packages/ticker/src/TickerPlugin.js index 360581f..833c6cb 100644 --- a/packages/ticker/src/TickerPlugin.js +++ b/packages/ticker/src/TickerPlugin.js @@ -1,4 +1,4 @@ -import Ticker from './Ticker'; +import { Ticker } from './Ticker'; import { UPDATE_PRIORITY } from './const'; /** @@ -12,7 +12,7 @@ * @class * @memberof PIXI */ -export default class TickerPlugin +export class TickerPlugin { /** * Initialize the plugin with scope of application instance diff --git a/packages/ticker/src/index.js b/packages/ticker/src/index.js index 96a94fe..06e42e5 100644 --- a/packages/ticker/src/index.js +++ b/packages/ticker/src/index.js @@ -1,5 +1,5 @@ import './settings'; -export { default as Ticker } from './Ticker'; -export { default as TickerPlugin } from './TickerPlugin'; +export * from './Ticker'; +export * from './TickerPlugin'; export * from './const'; diff --git a/packages/utils/src/media/CanvasRenderTarget.js b/packages/utils/src/media/CanvasRenderTarget.js index 8fe320f..ebb6114 100644 --- a/packages/utils/src/media/CanvasRenderTarget.js +++ b/packages/utils/src/media/CanvasRenderTarget.js @@ -6,7 +6,7 @@ * @class * @memberof PIXI.utils */ -export default class CanvasRenderTarget +export class CanvasRenderTarget { /** * @param {number} width - the width for the newly created canvas diff --git a/packages/utils/src/media/index.js b/packages/utils/src/media/index.js index 176355e..60b1aec 100644 --- a/packages/utils/src/media/index.js +++ b/packages/utils/src/media/index.js @@ -1,3 +1,3 @@ export * from './caches'; export * from './trimCanvas'; -export { default as CanvasRenderTarget } from './CanvasRenderTarget'; +export * from './CanvasRenderTarget';